[PHP-CVS] com php-src: Leftover: Bump version to 5.7.0: Zend/zend.h

2013-12-03 Thread Sebastian Bergmann
Commit:48cc47d55aedce5b90ac1458f4c2c3f6240f3019
Author:Sebastian Bergmann s...@sebastian-bergmann.de Tue, 3 Dec 
2013 07:42:37 +0100
Parents:   a87233f98a9d95f8178d868cc1db24a47af08948
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=48cc47d55aedce5b90ac1458f4c2c3f6240f3019

Log:
Leftover: Bump version to 5.7.0

Changed paths:
  M  Zend/zend.h


Diff:
diff --git a/Zend/zend.h b/Zend/zend.h
index 3ac559e..30d05d2 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION 2.6.0-dev
+#define ZEND_VERSION 2.7.0-dev
 
 #define ZEND_ENGINE_2


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



[PHP-CVS] com php-src: Add bison 2.6.4 to the list of supported versions: Zend/acinclude.m4

2013-07-02 Thread Sebastian Bergmann
Commit:50ac53e1b109795e3abb92735a3a35cebcdd47a7
Author:Sebastian Bergmann s...@sebastian-bergmann.de Wed, 3 Jul 
2013 06:36:54 +0200
Parents:   e4ee921b7ea7f549b6cc2ed29797a7f7f17962c6
Branches:  PHP-5.3

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=50ac53e1b109795e3abb92735a3a35cebcdd47a7

Log:
Add bison 2.6.4 to the list of supported versions

Changed paths:
  M  Zend/acinclude.m4


Diff:
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index 136d2d8..77430ab 100644
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
   # we only support certain bison versions
-  bison_version_list=1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 
2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2
+  bison_version_list=1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 
2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4
 
   # for standalone build of Zend Engine
   test -z $SED  SED=sed


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



[PHP-CVS] com php-src: Sync list of supported bison version with PHP-5.5: Zend/acinclude.m4

2013-07-02 Thread Sebastian Bergmann
Commit:9f5fc5c0eeb8806eb02bf836bdeace5f9bb35566
Author:Sebastian Bergmann s...@sebastian-bergmann.de Wed, 3 Jul 
2013 06:52:44 +0200
Parents:   c1db6f8bddd1630b77da8d030c48f3dc178f33f3
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9f5fc5c0eeb8806eb02bf836bdeace5f9bb35566

Log:
Sync list of supported bison version with PHP-5.5

Changed paths:
  M  Zend/acinclude.m4


Diff:
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index 136d2d8..454513f 100644
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
   # we only support certain bison versions
-  bison_version_list=1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 
2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2
+  bison_version_list=2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.3 
2.6.4 2.6.5 2.7
 
   # for standalone build of Zend Engine
   test -z $SED  SED=sed


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



[PHP-CVS] com php-src: Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak: .gitignore

2012-12-16 Thread Sebastian Bergmann
Commit:67a7a6646684855630bf98fe34eb026f018bf554
Author:Sebastian Bergmann sebast...@php.net Sun, 16 Dec 2012 
09:07:55 +0100
Parents:   717b367085d55528cad82716bc5ad9736831540f
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=67a7a6646684855630bf98fe34eb026f018bf554

Log:
Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak

Changed paths:
  M  .gitignore


Diff:
diff --git a/.gitignore b/.gitignore
index 6f291dc..cf615c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,8 @@ stamp-h.in
 scan_makefile_in.awk
 TSRM/tsrm_config.h
 Zend/zend_config.h
+Zend/zend_dtrace_gen.h
+Zend/zend_dtrace_gen.hbak
 Zend/zend_ini_parser.c
 Zend/zend_ini_parser.h
 Zend/zend_ini_parser.output


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



[PHP-CVS] com php-src: Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17: acinclude.m4

2012-12-15 Thread Sebastian Bergmann
Commit:4ef9f00c4624238c43ff6a31ef0dcfffb4794824
Author:Remi Collet r...@php.net Sun, 16 Dec 2012 08:51:17 +0100
Committer: Sebastian Bergmann sebast...@php.net  Sun, 16 Dec 2012 
08:52:02 +0100
Parents:   eb0693a975d7b5f7fd40df43c9eab3f4a3f3f59a
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4ef9f00c4624238c43ff6a31ef0dcfffb4794824

Log:
Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

Bugs:
https://bugs.php.net/63706

Changed paths:
  M  acinclude.m4


Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index 2085f0b..aadf4c0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2963,12 +2963,12 @@ dnl Generate Makefile.objects entries
   catMakefile.objectsEOF
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-   dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@  \$(SED) -ibak 
's,PHP_,DTRACE_,g' \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-   dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc 
$dtrace_objs
 
 EOF
 ])


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



[PHP-CVS] com php-src: Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17: acinclude.m4

2012-12-15 Thread Sebastian Bergmann
Commit:717b367085d55528cad82716bc5ad9736831540f
Author:Remi Collet r...@php.net Sun, 16 Dec 2012 08:51:17 +0100
Committer: Sebastian Bergmann sebast...@php.net  Sun, 16 Dec 2012 
08:51:17 +0100
Parents:   aaa5e42177c2b8eac77ff25b7b4335a1c2b9f214
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=717b367085d55528cad82716bc5ad9736831540f

Log:
Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

Bugs:
https://bugs.php.net/63706

Changed paths:
  M  acinclude.m4


Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index 2085f0b..aadf4c0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2963,12 +2963,12 @@ dnl Generate Makefile.objects entries
   catMakefile.objectsEOF
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-   dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@  \$(SED) -ibak 
's,PHP_,DTRACE_,g' \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-   dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc 
$dtrace_objs
 
 EOF
 ])


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



[PHP-CVS] com php-src: Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.: Makefile.frag Zend/Makefile.am ext/date/lib/parse_date.c ext/date/lib/p

2012-12-06 Thread Sebastian Bergmann
Commit:eab14993febbd3d083c1d45715af122baac140eb
Author:Sebastian Bergmann sebast...@php.net Thu, 6 Dec 2012 
09:28:35 +0100
Parents:   cd6bf838d5af7e4b402b57fc10526e6c453ad5c5
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=eab14993febbd3d083c1d45715af122baac140eb

Log:
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary 
changes in generated files.

Changed paths:
  M  Makefile.frag
  M  Zend/Makefile.am
  M  ext/date/lib/parse_date.c
  M  ext/date/lib/parse_iso_intervals.c
  M  ext/pdo/Makefile.frag
  M  ext/pdo/pdo_sql_parser.c
  M  ext/phar/Makefile.frag
  M  ext/phar/phar_path_check.c
  M  ext/standard/Makefile.frag
  M  ext/standard/url_scanner_ex.c
  M  ext/standard/var_unserializer.c
  M  win32/build/Makefile


Diff:
diff --git a/Makefile.frag b/Makefile.frag
index c8b3cb2..12646c2 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -7,7 +7,7 @@ $(builddir)/zend_language_scanner.lo: 
$(srcdir)/zend_language_parser.h
 $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
 
 $(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-   @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c 
Zend/zend_language_scanner.l)
+   @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date 
--case-inverted -cbdFt Zend/zend_language_scanner_defs.h 
-oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
 
 $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
 $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -18,6 +18,6 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
 
 $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-   @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
+   @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date 
--case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c 
Zend/zend_ini_scanner.l)
 
 $(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo 
$(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index e5757fa..6417f3e 100644
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -32,7 +32,7 @@ zend_ini_scanner.lo: zend_ini_parser.h
 # Language parser/scanner rules
 
 zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-   $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
$(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+   $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt 
$(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
 
 zend_language_parser.h: zend_language_parser.c
 zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -44,7 +44,7 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
 
 zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-   $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
$(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
+   $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt 
$(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
 
 zend_ini_parser.h: zend_ini_parser.c
 
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 4829da6..1ccddd2 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Sep 30 20:14:42 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 ext/date/lib/parse_date.re
 /*
+--+
diff --git a/ext/date/lib/parse_iso_intervals.c 
b/ext/date/lib/parse_iso_intervals.c
index 6be5bf1..fce91cf 100644
--- a/ext/date/lib/parse_iso_intervals.c
+++ b/ext/date/lib/parse_iso_intervals.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Dec  5 22:02:35 2011 */
+/* Generated by re2c 0.13.5 */
 #line 1 ext/date/lib/parse_iso_intervals.re
 /*
+--+
diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag
index 98f5c5f..5ba5f80 100644
--- a/ext/pdo/Makefile.frag
+++ b/ext/pdo/Makefile.frag
@@ -6,7 +6,7 @@ PDO_HEADER_FILES= \
 
 
 $(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re
-   (cd $(top_srcdir); $(RE2C) -o ext/pdo/pdo_sql_parser.c 
ext/pdo/pdo_sql_parser.re)
+   (cd $(top_srcdir); $(RE2C) --no-generation-date -o 
ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re)
 
 install-pdo-headers:
@echo Installing PDO headers:  
$(INSTALL_ROOT)$(phpincludedir)/ext/pdo/
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 0267d15..365b022 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo

[PHP-CVS] com php-src: Leftover: Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.: Zend/zend_ini_scanner.c Zend/zend_ini_scanner_defs.h Zend/zen

2012-12-06 Thread Sebastian Bergmann
Commit:8ca4288fd2432cf3eab1aeb3992ae4d53468c15c
Author:Sebastian Bergmann sebast...@php.net Thu, 6 Dec 2012 
09:43:27 +0100
Parents:   eab14993febbd3d083c1d45715af122baac140eb
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8ca4288fd2432cf3eab1aeb3992ae4d53468c15c

Log:
Leftover: Invoke re2c with --no-generation-date to prevent unintentional / 
unnecessary changes in generated files.

Changed paths:
  M  Zend/zend_ini_scanner.c
  M  Zend/zend_ini_scanner_defs.h
  M  Zend/zend_language_scanner.c
  M  Zend/zend_language_scanner_defs.h


Diff:
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 1c7f306..cb5f62c 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Nov 16 18:27:25 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 Zend/zend_ini_scanner.l
 /*
+--+
diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index b985f34..287d7bc 100644
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Nov 16 18:27:25 2012 */
+/* Generated by re2c 0.13.5 */
 #line 3 Zend/zend_ini_scanner_defs.h
 
 enum YYCONDTYPE {
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 48be8ea..248f618 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 Zend/zend_language_scanner.l
 /*
+--+
diff --git a/Zend/zend_language_scanner_defs.h 
b/Zend/zend_language_scanner_defs.h
index de220af..5926e3c 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */
+/* Generated by re2c 0.13.5 */
 #line 3 Zend/zend_language_scanner_defs.h
 
 enum YYCONDTYPE {


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



[PHP-CVS] com php-src: Cleanup NEWS: NEWS

2012-12-06 Thread Sebastian Bergmann
Commit:16ec6fa2064d243a89e3f551ac1c85f45ee4a996
Author:Sebastian Bergmann sebast...@php.net Thu, 6 Dec 2012 
11:03:37 +0100
Parents:   e3b2a5cf744d6d6dc8e4587cd081b9f1b662cd5a
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=16ec6fa2064d243a89e3f551ac1c85f45ee4a996

Log:
Cleanup NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 984b2bf..98d54b2 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,23 @@ PHP
NEWS
 ?? ??? 201?, PHP 5.5.0
 
 - General improvements:
+  . Added generators and coroutines (https://wiki.php.net/rfc/generators).
+(Nikita Popov)
+  . Added finally keyword (https://wiki.php.net/rfc/finally). (Laruence)
+  . Added simplified password hashing API
+(https://wiki.php.net/rfc/password_hash). (Anthony Ferrara)
+  . Added systemtap support by enabling systemtap compatible dtrace probes on
+linux. (David Soria Parra)
+  . Added support for list in foreach (https://wiki.php.net/rfc/foreachlist).
+(Laruence)
+  . Added support for using empty() on the result of function calls and
+other expressions (https://wiki.php.net/rfc/empty_isset_exprs).
+(Nikita Popov)
+  . Added support for constant array/string dereferencing. (Laruence)
+  . Improved set_exception_handler while doing reset.(Laruence)
+  . Removed php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid(),
+zend_logo_guid(). (Adnrew Faulds)
+  . Dropped support for Windows XP and 2003. (Pierre)
   . Optimized access to temporary and compiled VM variables. 8% less memory
 reads. (Dmitry)
   . The VM stacks for passing function arguments and syntaticaly nested calls
@@ -10,23 +27,6 @@ PHP  
  NEWS
 execution is calculated at compile time and preallocated at once. As result
 all the stack push operatins don't require checks for stack overflow
 any more. (Dmitry)
-  . Added support for generators. (Nikita Popov)
-  . Add simplified password hashing API 
-(https://wiki.php.net/rfc/password_hash). (Anthony Ferrara)
-  . Add generators and coroutines (https://wiki.php.net/rfc/generators).
-(Nikita Popov)
-  . Support list in foreach (https://wiki.php.net/rfc/foreachlist). (Laruence)
-  . Implemented 'finally' keyword (https://wiki.php.net/rfc/finally). 
(Laruence)
-  . Drop Windows XP and 2003 support. (Pierre)
-  . Improve set_exception_handler while doing reset.(Laruence)
-  . Support constant array/string dereferencing. (Laruence)
-  . Add support for using empty() on the result of function calls and
-other expressions (https://wiki.php.net/rfc/empty_isset_exprs).
-(Nikita Popov)
-  . Remove php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid(),
-zend_logo_guid(). (Adnrew Faulds)
-  . Add systemtap support by enabling systemtap compatible dtrace probes on
-linux. (David Soria Parra)
 
 - Calendar:
   . Fixed bug #54254 (cal_from_jd returns month = 6 when there is only one 
Adar)


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



[PHP-CVS] com php-src: Leftover: Bump version to 5.6.0: Zend/zend.h

2012-11-14 Thread Sebastian Bergmann
Commit:79726be67d891f2b0e09c9839347191e60581df2
Author:Sebastian Bergmann sebast...@php.net Wed, 14 Nov 2012 
16:50:33 +0100
Parents:   b27ef7a4f536b712db4a31a579436c66fa40bb72
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=79726be67d891f2b0e09c9839347191e60581df2

Log:
Leftover: Bump version to 5.6.0

Changed paths:
  M  Zend/zend.h


Diff:
diff --git a/Zend/zend.h b/Zend/zend.h
index d2a4ef6..0f98aad 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION 2.5.0-dev
+#define ZEND_VERSION 2.6.0-dev
 
 #define ZEND_ENGINE_2


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



[PHP-CVS] com php-src: WTF?: NEWS

2012-08-22 Thread Sebastian Bergmann
Commit:a90170e6f803f283d6c8e4e8d6b7bd8b7bd011a4
Author:Sebastian Bergmann sebast...@php.net Wed, 22 Aug 2012 
11:19:29 +0200
Parents:   596e855feb6855c236552c792d45c6259dcee406
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a90170e6f803f283d6c8e4e8d6b7bd8b7bd011a4

Log:
WTF?

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index f4df446..00f8ec6 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,6 @@ PHP 
   NEWS
 - General improvements:
   . Implemented 'finally' keyword (https://wiki.php.net/rfc/finally). 
(Laruence)
   . Drop Windows XP and 2003 support. (Pierre)
-  . World domination
   . Improve set_exception_handler while doing reset.(Laruence)
   . Support constant array/string dereferencing. (Laruence)
   . Add support for using empty() on the result of function calls and


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



[PHP-CVS] com php-src: Bump version.: Zend/zend.h

2012-08-21 Thread Sebastian Bergmann
Commit:0fa40bb9994a7a1e3d0a2c568285a15024220b6f
Author:Sebastian Bergmann sebast...@php.net Tue, 21 Aug 2012 
13:36:58 +0200
Parents:   47abbd1b4f62f7c7756a72e24e2a322898439c18
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0fa40bb9994a7a1e3d0a2c568285a15024220b6f

Log:
Bump version.

Changed paths:
  M  Zend/zend.h


Diff:
diff --git a/Zend/zend.h b/Zend/zend.h
index 39bf5be..de2a2e5 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION 2.4.0
+#define ZEND_VERSION 2.5.0-dev
 
 #define ZEND_ENGINE_2


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



[PHP-CVS] com php-src: Fixed CODING_STANDARD and move parameter parse code: ext/reflection/php_reflection.c

2012-05-15 Thread Sebastian Bergmann
Commit:6712d0d20db546dc6bcba4b0c8db6c2e2ff816da
Author:reeze reeze@gmail.com Wed, 4 Apr 2012 14:06:55 +0800
Parents:   054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6712d0d20db546dc6bcba4b0c8db6c2e2ff816da

Log:
Fixed CODING_STANDARD and move parameter parse code

Changed paths:
  M  ext/reflection/php_reflection.c


Diff:
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index ef1ed7e..406da93 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1463,10 +1463,6 @@ static parameter_reference 
*_reflection_param_get_default_param(INTERNAL_FUNCTIO
reflection_object *intern;
parameter_reference *param;
 
-   if (zend_parse_parameters_none() == FAILURE) {
-   return NULL;
-   }
-
GET_REFLECTION_OBJECT_PTR(param);
 
if (param-fptr-type != ZEND_USER_FUNCTION)
@@ -1485,16 +1481,12 @@ static parameter_reference 
*_reflection_param_get_default_param(INTERNAL_FUNCTIO
 /* }}} */
 
 /* {{{ _reflection_param_get_default_precv */
-static zend_op 
*_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAMETERS)
+static zend_op 
*_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAMETERS, 
parameter_reference *param)
 {
zend_op *precv;
-   parameter_reference *param = 
_reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-
-   if (zend_parse_parameters_none() == FAILURE) {
-   return NULL;
-   }
 
-   if(!param) {
+   param = param ? param : 
_reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   if (!param) {
return NULL;
}
 
@@ -2587,9 +2579,13 @@ ZEND_METHOD(reflection_parameter, 
isDefaultValueAvailable)
 ZEND_METHOD(reflection_parameter, getDefaultValue)
 {
parameter_reference *param =  
_reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU, param);
+
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
+   }
 
-   if(!(param  precv)) {
+   if (!(param  precv)) {
return;
}
 
@@ -2606,7 +2602,11 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
Returns whether the default value of this parameter is constant */
 ZEND_METHOD(reflection_parameter, isDefaultValueConstant)
 {
-   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU, NULL);
+
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
+   }
 
if (precv  (Z_TYPE_P(precv-op2.zv)  IS_CONSTANT_TYPE_MASK) == 
IS_CONSTANT) {
RETURN_TRUE;
@@ -2620,7 +2620,11 @@ ZEND_METHOD(reflection_parameter, isDefaultValueConstant)
Returns the default value's constant name if default value is constant or 
false */
 ZEND_METHOD(reflection_parameter, getDefaultValueConstantName)
 {
-   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU, NULL);
+
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
+   }
 
if (precv  (Z_TYPE_P(precv-op2.zv)  IS_CONSTANT_TYPE_MASK) == 
IS_CONSTANT) {
RETURN_STRING(Z_STRVAL_P(precv-op2.zv), 1);


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



[PHP-CVS] com php-src: Merge branch 'add-const-name' of git://github.com/reeze/php-src into PHP-5.4: NEWS

2012-05-15 Thread Sebastian Bergmann
Commit:83449b48d42ab004dc1b11d83848a140c4813891
Author:Sebastian Bergmann sebast...@php.net Tue, 15 May 2012 
11:08:08 +0200
Parents:   0ad53bfd7da12a92a46c08e3fff579a15026b88b 
6712d0d20db546dc6bcba4b0c8db6c2e2ff816da
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=83449b48d42ab004dc1b11d83848a140c4813891

Log:
Merge branch 'add-const-name' of git://github.com/reeze/php-src into PHP-5.4

Changed paths:
  MM  NEWS


Diff:



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



[PHP-CVS] com php-src: Implemented FR #61602 Allow access to name of constant used as default value: NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionParameter_DefaultValueConstant_

2012-05-15 Thread Sebastian Bergmann
Commit:054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74
Author:reeze reeze@gmail.com Tue, 3 Apr 2012 13:47:16 +0800
Parents:   3bf53aa911e1e2128a11aee45c126000635de006
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74

Log:
Implemented FR #61602 Allow access to name of constant used as default value

Bugs:
https://bugs.php.net/61602

Changed paths:
  M  NEWS
  M  ext/reflection/php_reflection.c
  A  ext/reflection/tests/ReflectionParameter_DefaultValueConstant_basic1.phpt
  A  ext/reflection/tests/ReflectionParameter_DefaultValueConstant_basic2.phpt
  A  ext/reflection/tests/ReflectionParameter_DefaultValueConstant_error.phpt

diff --git a/NEWS b/NEWS
index 6fc9126..01eed64 100644
--- a/NEWS
+++ b/NEWS
@@ -100,6 +100,8 @@ PHP 
   NEWS
 bytes). (Nikita Popov)
 
 - Reflection:
+  . Implemented FR #61602 (Allow access to the name of constant
+used as function/method parameter's default value). (reeze@gmail.com)
   . Fixed bug #60968 (Late static binding doesn't work with 
 ReflectionMethod::invokeArgs()). (Laruence)
 
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 1cf65ce..ef1ed7e 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1457,6 +1457,57 @@ static void 
_reflection_export(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *c
 }
 /* }}} */
 
+/* {{{ _reflection_param_get_default_param */
+static parameter_reference 
*_reflection_param_get_default_param(INTERNAL_FUNCTION_PARAMETERS)
+{
+   reflection_object *intern;
+   parameter_reference *param;
+
+   if (zend_parse_parameters_none() == FAILURE) {
+   return NULL;
+   }
+
+   GET_REFLECTION_OBJECT_PTR(param);
+
+   if (param-fptr-type != ZEND_USER_FUNCTION)
+   {
+   zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Cannot determine default value for internal functions);
+   return NULL;
+   }
+
+   if (param-offset  param-required) {
+   zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Parameter is not optional);
+   return NULL;
+   }
+
+   return param;
+}
+/* }}} */
+
+/* {{{ _reflection_param_get_default_precv */
+static zend_op 
*_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAMETERS)
+{
+   zend_op *precv;
+   parameter_reference *param = 
_reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+
+   if (zend_parse_parameters_none() == FAILURE) {
+   return NULL;
+   }
+
+   if(!param) {
+   return NULL;
+   }
+
+   precv = _get_recv_op((zend_op_array*)param-fptr, param-offset);
+   if (!precv || precv-opcode != ZEND_RECV_INIT || precv-op2_type == 
IS_UNUSED) {
+   zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Internal error);
+   return NULL;
+   }
+
+   return precv;
+}
+/* }}} */
+
 /* {{{ Preventing __clone from being called */
 ZEND_METHOD(reflection, __clone)
 {
@@ -2535,27 +2586,10 @@ ZEND_METHOD(reflection_parameter, 
isDefaultValueAvailable)
Returns the default value of this parameter or throws an exception */
 ZEND_METHOD(reflection_parameter, getDefaultValue)
 {
-   reflection_object *intern;
-   parameter_reference *param;
-   zend_op *precv;
+   parameter_reference *param =  
_reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 
-   if (zend_parse_parameters_none() == FAILURE) {
-   return;
-   }
-   GET_REFLECTION_OBJECT_PTR(param);
-
-   if (param-fptr-type != ZEND_USER_FUNCTION)
-   {
-   zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Cannot determine default value for internal functions);
-   return;
-   }
-   if (param-offset  param-required) {
-   zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Parameter is not optional);
-   return;
-   }
-   precv = _get_recv_op((zend_op_array*)param-fptr, param-offset);
-   if (!precv || precv-opcode != ZEND_RECV_INIT || precv-op2_type == 
IS_UNUSED) {
-   zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Internal error);
+   if(!(param  precv)) {
return;
}
 
@@ -2568,6 +2602,34 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
 }
 /* }}} */
 
+/* {{{ proto public bool ReflectionParameter::isDefaultValueConstant()
+   Returns whether the default value of this parameter is constant */
+ZEND_METHOD(reflection_parameter, isDefaultValueConstant)
+{
+   zend_op *precv = 
_reflection_param_get_default_precv(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+
+   if (precv  

[PHP-CVS] com php-src: Fix NEWS entry for #61602.: NEWS

2012-05-15 Thread Sebastian Bergmann
Commit:38398529b814fa75cc79ee3e3de6b05171779775
Author:Sebastian Bergmann sebast...@php.net Tue, 15 May 2012 
11:14:36 +0200
Parents:   83449b48d42ab004dc1b11d83848a140c4813891
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=38398529b814fa75cc79ee3e3de6b05171779775

Log:
Fix NEWS entry for #61602.

Bugs:
https://bugs.php.net/61602

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 2b74354..728c2f3 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,10 @@ PHP  
  NEWS
   . Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename
 set to null). (Anatoliy)
 
+- Reflection:
+  . Implemented FR #61602 (Allow access to the name of constant
+used as function/method parameter's default value). (reeze@gmail.com)
+
 - FPM
   . Fixed bug #61812 (Uninitialised value used in libmagic). 
 (Laruence, Gustavo)


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



[PHP-CVS] [git] branch php-src.git: update branch PHP-5.3

2012-03-19 Thread Sebastian Bergmann
Branch PHP-5.3 in php-src.git was updated
Date: Mon, 19 Mar 2012 17:37:11 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=bcd19cf6491030f3bfd14d769011ba8f20d99333;hp=887ee455dc2059a3154ee1173e2b973932067743


Log:
Commit: bcd19cf6491030f3bfd14d769011ba8f20d99333
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:25:37 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:25:37 +0100
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd19cf6491030f3bfd14d769011ba8f20d99333
Shortlog: Add missing files.




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



[PHP-CVS] [git] branch php-src.git: update branch master

2012-03-19 Thread Sebastian Bergmann
Branch master in php-src.git was updated
Date: Mon, 19 Mar 2012 17:37:12 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=ae5e8ad9c3e1594bdd56db302347e34456c9478c;hp=dea5376644d01bcecec1c5afaca07948b65f577f


Log:
Commit: ae5e8ad9c3e1594bdd56db302347e34456c9478c
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:26:01 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:26:01 +0100
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=ae5e8ad9c3e1594bdd56db302347e34456c9478c
Shortlog: Merge branch 'PHP-5.4'

Commit: 5bfd8920a2782e8347bcf15a4a702b0213b165f6
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:25:49 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:25:49 +0100
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=5bfd8920a2782e8347bcf15a4a702b0213b165f6
Shortlog: Merge branch 'PHP-5.3' into PHP-5.4

Commit: bcd19cf6491030f3bfd14d769011ba8f20d99333
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:25:37 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:25:37 +0100
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd19cf6491030f3bfd14d769011ba8f20d99333
Shortlog: Add missing files.




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



[PHP-CVS] [git] commit php-src.git: .gitignore

2012-03-19 Thread Sebastian Bergmann
Commit: bcd19cf6491030f3bfd14d769011ba8f20d99333
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:25:37 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:25:37 +0100
Parents: 887ee455dc2059a3154ee1173e2b973932067743

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd19cf6491030f3bfd14d769011ba8f20d99333

Log:
Add missing files.

Changed paths:
  M  .gitignore


Diff:
bcd19cf6491030f3bfd14d769011ba8f20d99333
diff --git a/.gitignore b/.gitignore
index ce6f9d6..f104329 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,6 +94,19 @@ want_dependencies
 x64
 stamp-h.in
 scan_makefile_in.awk
+TSRM/tsrm_config.h
+Zend/zend_config.h
+Zend/zend_ini_parser.c
+Zend/zend_ini_parser.h
+Zend/zend_ini_parser.output
+Zend/zend_language_parser.c
+Zend/zend_language_parser.h
+Zend/zend_language_parser.output
+ext/date/lib/timelib_config.h
+ext/iconv/php_iconv_aliased_libiconv.h
+ext/phar/phar.php
+main/php_config.h
+main/php_config.h.in
 
 # Test specific Ignores
 */tests/*.diff



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



[PHP-CVS] [git] commit php-src.git:

2012-03-19 Thread Sebastian Bergmann
Commit: 5bfd8920a2782e8347bcf15a4a702b0213b165f6
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:25:49 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:25:49 +0100
Parents: 53e3467ff233af4a40626f86ea8a61880722beb8 
bcd19cf6491030f3bfd14d769011ba8f20d99333

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=5bfd8920a2782e8347bcf15a4a702b0213b165f6

Log:
Merge branch 'PHP-5.3' into PHP-5.4

Changed paths:


Diff:
5bfd8920a2782e8347bcf15a4a702b0213b165f6



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



[PHP-CVS] [git] branch php-src.git: update branch PHP-5.4

2012-03-19 Thread Sebastian Bergmann
Branch PHP-5.4 in php-src.git was updated
Date: Mon, 19 Mar 2012 17:37:12 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=5bfd8920a2782e8347bcf15a4a702b0213b165f6;hp=53e3467ff233af4a40626f86ea8a61880722beb8


Log:
Commit: 5bfd8920a2782e8347bcf15a4a702b0213b165f6
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:25:49 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:25:49 +0100
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=5bfd8920a2782e8347bcf15a4a702b0213b165f6
Shortlog: Merge branch 'PHP-5.3' into PHP-5.4

Commit: bcd19cf6491030f3bfd14d769011ba8f20d99333
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:25:37 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:25:37 +0100
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd19cf6491030f3bfd14d769011ba8f20d99333
Shortlog: Add missing files.




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



[PHP-CVS] [git] commit php-src.git:

2012-03-19 Thread Sebastian Bergmann
Commit: ae5e8ad9c3e1594bdd56db302347e34456c9478c
Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 
18:26:01 +0100
Committer: Sebastian Bergmann(s...@sebastian-bergmann.de)  Mon, 19 Mar 2012 
18:26:01 +0100
Parents: dea5376644d01bcecec1c5afaca07948b65f577f 
5bfd8920a2782e8347bcf15a4a702b0213b165f6

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=ae5e8ad9c3e1594bdd56db302347e34456c9478c

Log:
Merge branch 'PHP-5.4'

Changed paths:


Diff:
ae5e8ad9c3e1594bdd56db302347e34456c9478c



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



[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionClass_setFinal.phpt ext/reflection/tests/ReflectionClass_toString_001.phpt ext/reflection/tests/R

2012-01-17 Thread Sebastian Bergmann
sebastianTue, 17 Jan 2012 12:59:33 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=322390

Log:
Implement ReflectionClass::setFinal() and ReflectionMethod::setFinal().

Patch by Jan Dolecek juzna...@gmail.com.

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/reflection/php_reflection.c
A   php/php-src/trunk/ext/reflection/tests/ReflectionClass_setFinal.phpt
U   php/php-src/trunk/ext/reflection/tests/ReflectionClass_toString_001.phpt
A   php/php-src/trunk/ext/reflection/tests/ReflectionMethod_setFinal.phpt

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2012-01-17 10:35:39 UTC (rev 322389)
+++ php/php-src/trunk/NEWS  2012-01-17 12:59:33 UTC (rev 322390)
@@ -35,4 +35,9 @@
 - pgsql
   . Added pg_escape_literal() and pg_escape_identifier() (Yasuo)

+- Reflection:
+  . Added ReflectionCLass::setFinal() and ReflectionMethod::setFinal() to allow
+stubbing and mocking of final classes and methods, for instance.
+(Sebastian, Jan Dolecek juzna...@gmail.com)
+
  NOTE: Insert NEWS from last stable release here prior to actual release! 


Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===
--- php/php-src/trunk/ext/reflection/php_reflection.c   2012-01-17 10:35:39 UTC 
(rev 322389)
+++ php/php-src/trunk/ext/reflection/php_reflection.c   2012-01-17 12:59:33 UTC 
(rev 322390)
@@ -3113,6 +3113,28 @@
 }
 /* }}} */

+/* {{{ proto public void ReflectionMethod::setFinal([bool isFinal = true])
+  Sets/unsets class as final */
+ZEND_METHOD(reflection_method, setFinal)
+{
+   reflection_object *intern;
+   zend_function *mptr;
+   zend_bool isFinal = 1;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, isFinal) == 
FAILURE) {
+   return;
+   }
+
+   GET_REFLECTION_OBJECT_PTR(mptr);
+
+   if (isFinal) {
+   mptr-common.fn_flags |= ZEND_ACC_FINAL;
+   } else {
+   mptr-common.fn_flags = ~ZEND_ACC_FINAL;
+   }
+}
+/* }}} */
+
 /* {{{ proto public ReflectionClass ReflectionMethod::getDeclaringClass()
Get the declaring class */
 ZEND_METHOD(reflection_method, getDeclaringClass)
@@ -4047,6 +4069,28 @@
 }
 /* }}} */

+/* {{{ proto public void ReflectionClass::setFinal([bool isFinal = true])
+   Sets/unsets class as final */
+ZEND_METHOD(reflection_class, setFinal)
+{
+   reflection_object *intern;
+   zend_class_entry *ce;
+   zend_bool isFinal = 1;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, isFinal) == 
FAILURE) {
+   return;
+   }
+
+   GET_REFLECTION_OBJECT_PTR(ce);
+
+   if (isFinal) {
+   ce-ce_flags |= ZEND_ACC_FINAL_CLASS;
+   } else {
+   ce-ce_flags = ~ZEND_ACC_FINAL_CLASS;
+   }
+}
+/* }}} */
+
 /* {{{ proto public int ReflectionClass::getModifiers()
Returns a bitfield of the access modifiers for this class */
 ZEND_METHOD(reflection_class, getModifiers)
@@ -5651,6 +5695,10 @@
ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()

+ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_setFinal, 0)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_getClosure, 0)
ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
@@ -5664,6 +5712,7 @@
ZEND_ME(reflection_method, isProtected, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isAbstract, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isFinal, arginfo_reflection__void, 0)
+   ZEND_ME(reflection_method, setFinal, 
arginfo_reflection_method_setFinal, 0)
ZEND_ME(reflection_method, isStatic, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isConstructor, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isDestructor, arginfo_reflection__void, 0)
@@ -5733,6 +5782,10 @@
ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()

+ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_setFinal, 0)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstance, 0)
ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
@@ -5785,6 +5838,7 @@
ZEND_ME(reflection_class, isTrait, arginfo_reflection__void, 0)
ZEND_ME(reflection_class, isAbstract, arginfo_reflection__void, 0)
ZEND_ME(reflection_class, isFinal, arginfo_reflection__void, 0)
+   ZEND_ME(reflection_class, setFinal, arginfo_reflection_class_setFinal, 
0)
ZEND_ME(reflection_class, getModifiers, arginfo_reflection__void, 0)
ZEND_ME(reflection_class, isInstance, 
arginfo_reflection_class_isInstance, 0)
ZEND_ME(reflection_class, newInstance, 
arginfo_reflection_class_newInstance, 0)

Added: php/php-src/trunk/ext/reflection/tests/ReflectionClass_setFinal.phpt

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionClass_setFinal.phpt ext/reflection/tests/ReflectionClass_toString_001.phpt ext/reflection/tests/R

2012-01-17 Thread Sebastian Bergmann
sebastianTue, 17 Jan 2012 13:46:31 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=322398

Log:
Revert r322390.

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/reflection/php_reflection.c
D   php/php-src/trunk/ext/reflection/tests/ReflectionClass_setFinal.phpt
U   php/php-src/trunk/ext/reflection/tests/ReflectionClass_toString_001.phpt
D   php/php-src/trunk/ext/reflection/tests/ReflectionMethod_setFinal.phpt

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2012-01-17 13:38:26 UTC (rev 322397)
+++ php/php-src/trunk/NEWS  2012-01-17 13:46:31 UTC (rev 322398)
@@ -35,9 +35,4 @@
 - pgsql
   . Added pg_escape_literal() and pg_escape_identifier() (Yasuo)

-- Reflection:
-  . Added ReflectionCLass::setFinal() and ReflectionMethod::setFinal() to allow
-stubbing and mocking of final classes and methods, for instance.
-(Sebastian, Jan Dolecek juzna...@gmail.com)
-
  NOTE: Insert NEWS from last stable release here prior to actual release! 


Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===
--- php/php-src/trunk/ext/reflection/php_reflection.c   2012-01-17 13:38:26 UTC 
(rev 322397)
+++ php/php-src/trunk/ext/reflection/php_reflection.c   2012-01-17 13:46:31 UTC 
(rev 322398)
@@ -3113,28 +3113,6 @@
 }
 /* }}} */

-/* {{{ proto public void ReflectionMethod::setFinal([bool isFinal = true])
-  Sets/unsets class as final */
-ZEND_METHOD(reflection_method, setFinal)
-{
-   reflection_object *intern;
-   zend_function *mptr;
-   zend_bool isFinal = 1;
-
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, isFinal) == 
FAILURE) {
-   return;
-   }
-
-   GET_REFLECTION_OBJECT_PTR(mptr);
-
-   if (isFinal) {
-   mptr-common.fn_flags |= ZEND_ACC_FINAL;
-   } else {
-   mptr-common.fn_flags = ~ZEND_ACC_FINAL;
-   }
-}
-/* }}} */
-
 /* {{{ proto public ReflectionClass ReflectionMethod::getDeclaringClass()
Get the declaring class */
 ZEND_METHOD(reflection_method, getDeclaringClass)
@@ -4069,28 +4047,6 @@
 }
 /* }}} */

-/* {{{ proto public void ReflectionClass::setFinal([bool isFinal = true])
-   Sets/unsets class as final */
-ZEND_METHOD(reflection_class, setFinal)
-{
-   reflection_object *intern;
-   zend_class_entry *ce;
-   zend_bool isFinal = 1;
-
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, isFinal) == 
FAILURE) {
-   return;
-   }
-
-   GET_REFLECTION_OBJECT_PTR(ce);
-
-   if (isFinal) {
-   ce-ce_flags |= ZEND_ACC_FINAL_CLASS;
-   } else {
-   ce-ce_flags = ~ZEND_ACC_FINAL_CLASS;
-   }
-}
-/* }}} */
-
 /* {{{ proto public int ReflectionClass::getModifiers()
Returns a bitfield of the access modifiers for this class */
 ZEND_METHOD(reflection_class, getModifiers)
@@ -5695,10 +5651,6 @@
ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_setFinal, 0)
-   ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_getClosure, 0)
ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
@@ -5712,7 +5664,6 @@
ZEND_ME(reflection_method, isProtected, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isAbstract, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isFinal, arginfo_reflection__void, 0)
-   ZEND_ME(reflection_method, setFinal, 
arginfo_reflection_method_setFinal, 0)
ZEND_ME(reflection_method, isStatic, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isConstructor, arginfo_reflection__void, 0)
ZEND_ME(reflection_method, isDestructor, arginfo_reflection__void, 0)
@@ -5782,10 +5733,6 @@
ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_setFinal, 0)
-   ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstance, 0)
ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
@@ -5838,7 +5785,6 @@
ZEND_ME(reflection_class, isTrait, arginfo_reflection__void, 0)
ZEND_ME(reflection_class, isAbstract, arginfo_reflection__void, 0)
ZEND_ME(reflection_class, isFinal, arginfo_reflection__void, 0)
-   ZEND_ME(reflection_class, setFinal, arginfo_reflection_class_setFinal, 
0)
ZEND_ME(reflection_class, getModifiers, arginfo_reflection__void, 0)
ZEND_ME(reflection_class, isInstance, 
arginfo_reflection_class_isInstance, 0)
ZEND_ME(reflection_class, newInstance, 
arginfo_reflection_class_newInstance, 0)

Deleted: php/php-src/trunk/ext/reflection/tests/ReflectionClass_setFinal.phpt
===
--- 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/reflection/php_reflection.c branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt branches/PH

2011-08-26 Thread Sebastian Bergmann
sebastianFri, 26 Aug 2011 07:40:31 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=315538

Log:
Close #55490.

Bug: https://bugs.php.net/55490 (Open) Allow instantiating objects without 
invoking the constructor
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
A   
php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
U   
php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_toString_001.phpt
U   php/php-src/trunk/ext/reflection/php_reflection.c
A   
php/php-src/trunk/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
U   php/php-src/trunk/ext/reflection/tests/ReflectionClass_toString_001.phpt

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS	2011-08-26 07:34:58 UTC (rev 315537)
+++ php/php-src/branches/PHP_5_4/NEWS	2011-08-26 07:40:31 UTC (rev 315538)
@@ -23,6 +23,10 @@
 - Improved NSAPI SAPI: (Uwe Schindler)
   . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403).

+- Improved Reflection extension:
+  . Added ReflectionClass::newInstanceWithoutConstructor() to create a new
+instance of a class without invoking its constructor. FR #55490. (Sebastian)
+
 04 Aug 2011, PHP 5.4.0 Alpha 3
 - Added features:
  . Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail

Modified: php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c	2011-08-26 07:34:58 UTC (rev 315537)
+++ php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c	2011-08-26 07:40:31 UTC (rev 315538)
@@ -4129,6 +4129,25 @@
 }
 /* }}} */

+/* {{{ proto public stdclass ReflectionClass::newInstanceWithoutConstructor()
+   Returns an instance of this class without invoking its constructor */
+ZEND_METHOD(reflection_class, newInstanceWithoutConstructor)
+{
+	zval *retval_ptr = NULL;
+	reflection_object *intern;
+	zend_class_entry *ce;
+
+	METHOD_NOTSTATIC(reflection_class_ptr);
+	GET_REFLECTION_OBJECT_PTR(ce);
+
+	if (ce-create_object != NULL) {
+		zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, Class %s is an internal class that cannot be instantiated without invoking its constructor, ce-name);
+	}
+
+	object_init_ex(return_value, ce);
+}
+/* }}} */
+
 /* {{{ proto public stdclass ReflectionClass::newInstanceArgs([array args])
Returns an instance of this class */
 ZEND_METHOD(reflection_class, newInstanceArgs)
@@ -5694,6 +5713,9 @@
 	ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()

+ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstanceWithoutConstructor, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstanceArgs, 0, 0, 0)
 	ZEND_ARG_ARRAY_INFO(0, args, 0)
 ZEND_END_ARG_INFO()
@@ -5742,6 +5764,7 @@
 	ZEND_ME(reflection_class, getModifiers, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, isInstance, arginfo_reflection_class_isInstance, 0)
 	ZEND_ME(reflection_class, newInstance, arginfo_reflection_class_newInstance, 0)
+	ZEND_ME(reflection_class, newInstanceWithoutConstructor, arginfo_reflection_class_newInstanceWithoutConstructor, 0)
 	ZEND_ME(reflection_class, newInstanceArgs, arginfo_reflection_class_newInstanceArgs, 0)
 	ZEND_ME(reflection_class, getParentClass, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, isSubclassOf, arginfo_reflection_class_isSubclassOf, 0)

Added: php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
===
--- php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt	2011-08-26 07:40:31 UTC (rev 315538)
@@ -0,0 +1,33 @@
+--TEST--
+ReflectionClass::newInstanceWithoutConstructor()
+--CREDITS--
+Sebastian Bergmann sebast...@php.net
+--FILE--
+?php
+class Foo
+{
+public function __construct()
+{
+print __METHOD__;
+}
+}
+
+$class = new ReflectionClass('Foo');
+var_dump($class-newInstanceWithoutConstructor());
+
+$class = new ReflectionClass('StdClass');
+var_dump($class-newInstanceWithoutConstructor());
+
+$class = new ReflectionClass('DateTime');
+var_dump($class-newInstanceWithoutConstructor());
+--EXPECTF--
+object(Foo)#%d (0) {
+}
+object(stdClass)#%d (0) {
+}
+
+Fatal error: Uncaught exception 'ReflectionException' with message 'Class DateTime is an internal class that cannot be instantiated without invoking its constructor' in %s/tests/ReflectionClass_newInstanceWithoutConstructor.php:%d
+Stack trace:
+#0 %s

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_builtin_functions.h trunk/Zend/zend_builtin_functions.h

2011-03-10 Thread Sebastian Bergmann
sebastianFri, 11 Mar 2011 03:52:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=309106

Log:
Fix prototype of zend_fetch_debug_backtrace().

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.h
U   php/php-src/trunk/Zend/zend_builtin_functions.h

Modified: php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.h
===
--- php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.h  2011-03-11 
02:41:01 UTC (rev 309105)
+++ php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.h  2011-03-11 
03:52:39 UTC (rev 309106)
@@ -25,7 +25,7 @@
 int zend_startup_builtin_functions(TSRMLS_D);

 BEGIN_EXTERN_C()
-ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, 
int provide_object TSRMLS_DC);
+ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, 
int options TSRMLS_DC);
 END_EXTERN_C()

 #endif /* ZEND_BUILTIN_FUNCTIONS_H */

Modified: php/php-src/trunk/Zend/zend_builtin_functions.h
===
--- php/php-src/trunk/Zend/zend_builtin_functions.h 2011-03-11 02:41:01 UTC 
(rev 309105)
+++ php/php-src/trunk/Zend/zend_builtin_functions.h 2011-03-11 03:52:39 UTC 
(rev 309106)
@@ -25,7 +25,7 @@
 int zend_startup_builtin_functions(TSRMLS_D);

 BEGIN_EXTERN_C()
-ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, 
int provide_object TSRMLS_DC);
+ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, 
int options TSRMLS_DC);
 END_EXTERN_C()

 #endif /* ZEND_BUILTIN_FUNCTIONS_H */

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

[PHP-CVS] svn: /php/php-src/trunk/ NEWS

2011-03-06 Thread Sebastian Bergmann
sebastianSun, 06 Mar 2011 21:47:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=308980

Log:
Fix speling.

Changed paths:
U   php/php-src/trunk/NEWS

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2011-03-06 19:31:23 UTC (rev 308979)
+++ php/php-src/trunk/NEWS  2011-03-06 21:47:46 UTC (rev 308980)
@@ -31,7 +31,7 @@
   a property into a warning. (Scott)

 - General improvements:
-  . Added multibyte suppport by default. Previosly php had to be compiled
+  . Added multibyte suppport by default. Previously php had to be compiled
 with --enable-zend-multibyte. Now it can be enabled or disabled throug
 zend.multibyte directive in php.ini (Dmitry)
   . Removed compile time dependency from ext/mbstring (Dmitry)

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

[PHP-CVS] svn: /php/php-src/trunk/ NEWS

2010-07-08 Thread Sebastian Bergmann
sebastianThu, 08 Jul 2010 15:05:22 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=301084

Log:
Fugbix typo.

Changed paths:
U   php/php-src/trunk/NEWS

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2010-07-08 14:25:38 UTC (rev 301083)
+++ php/php-src/trunk/NEWS  2010-07-08 15:05:22 UTC (rev 301084)
@@ -13,7 +13,7 @@
   . ZEND_RETURN is splitted into two new instructions ZEND_RETURN and
 ZEND_RETURN_BY_REF
   . optimized access to global constants using values with pre-calculated
-hash_values from litersls table
+hash_values from literals table
   . optimized access to static properties using executor specialization.
 A constant class name may be used as a direct operand of ZEND_FETCH_*
 instruction without previous ZEND_FETCH_CLASS.

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

[PHP-CVS] svn: /php/php-src/trunk/ configure.in

2010-03-23 Thread Sebastian Bergmann
sebastianTue, 23 Mar 2010 21:19:18 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296689

Log:
Fix version.

Changed paths:
U   php/php-src/trunk/configure.in

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2010-03-23 19:56:53 UTC (rev 296688)
+++ php/php-src/trunk/configure.in  2010-03-23 21:19:18 UTC (rev 296689)
@@ -41,7 +41,7 @@

 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=3
+PHP_RELEASE_VERSION=99
 PHP_EXTRA_VERSION=-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ basic_functions.c dns.c php_dns.h

2010-01-07 Thread Sebastian Bergmann
sebastianThu, 07 Jan 2010 11:02:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293211

Log:
sed -i s#1997-2008#1997-2010#g **/*.c **/*.h

Bug: http://bugs.php.net/1997 (Bogus) Compilation Problems
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U   php/php-src/branches/PHP_5_3/ext/standard/dns.c
U   php/php-src/branches/PHP_5_3/ext/standard/php_dns.h

Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2010-01-07 
10:51:05 UTC (rev 293210)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2010-01-07 
11:02:39 UTC (rev 293211)
@@ -2,7 +2,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2008 The PHP Group|
+   | Copyright (c) 1997-2010 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2010-01-07 10:51:05 UTC 
(rev 293210)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2010-01-07 11:02:39 UTC 
(rev 293211)
@@ -2,7 +2,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2008 The PHP Group|
+   | Copyright (c) 1997-2010 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/ext/standard/php_dns.h
===
--- php/php-src/branches/PHP_5_3/ext/standard/php_dns.h 2010-01-07 10:51:05 UTC 
(rev 293210)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_dns.h 2010-01-07 11:02:39 UTC 
(rev 293211)
@@ -2,7 +2,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2008 The PHP Group|
+   | Copyright (c) 1997-2010 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/Zend/zend_ini_parser.y branches/PHP_5_3/Zend/zend_ini_parser.y branches/PHP_5_3/Zend/zend_ini_scanner.l branches/PHP_5_3/Zend/zend_language_parser.y branc

2010-01-05 Thread Sebastian Bergmann
sebastianTue, 05 Jan 2010 20:40:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293154

Log:
sed -i s#1998-2009#1998-2010#g **/*.re **/*.y **/*.l

Bug: http://bugs.php.net/1998 (Closed) PHP dies (segfaults) on successful 
mysql_connect
  
Changed paths:
U   php/php-src/branches/PHP_5_2/Zend/zend_ini_parser.y
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_parser.y
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l
U   php/php-src/branches/PHP_5_3/Zend/zend_language_parser.y
U   php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l
U   php/php-src/branches/PHP_5_3_2/Zend/zend_ini_parser.y
U   php/php-src/branches/PHP_5_3_2/Zend/zend_ini_scanner.l
U   php/php-src/branches/PHP_5_3_2/Zend/zend_language_parser.y
U   php/php-src/branches/PHP_5_3_2/Zend/zend_language_scanner.l
U   php/php-src/trunk/Zend/zend_ini_parser.y
U   php/php-src/trunk/Zend/zend_ini_scanner.l
U   php/php-src/trunk/Zend/zend_language_parser.y
U   php/php-src/trunk/Zend/zend_language_scanner.l

Modified: php/php-src/branches/PHP_5_2/Zend/zend_ini_parser.y
===
--- php/php-src/branches/PHP_5_2/Zend/zend_ini_parser.y	2010-01-05 20:35:43 UTC (rev 293153)
+++ php/php-src/branches/PHP_5_2/Zend/zend_ini_parser.y	2010-01-05 20:40:23 UTC (rev 293154)
@@ -3,7 +3,7 @@
+--+
| Zend Engine  |
+--+
-   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+--+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_parser.y
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_parser.y	2010-01-05 20:35:43 UTC (rev 293153)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_parser.y	2010-01-05 20:40:23 UTC (rev 293154)
@@ -3,7 +3,7 @@
+--+
| Zend Engine  |
+--+
-   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+--+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l	2010-01-05 20:35:43 UTC (rev 293153)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l	2010-01-05 20:40:23 UTC (rev 293154)
@@ -2,7 +2,7 @@
+--+
| Zend Engine  |
+--+
-   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+--+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/Zend/zend_language_parser.y
===
--- php/php-src/branches/PHP_5_3/Zend/zend_language_parser.y	2010-01-05 20:35:43 UTC (rev 293153)
+++ php/php-src/branches/PHP_5_3/Zend/zend_language_parser.y	2010-01-05 20:40:23 UTC (rev 293154)
@@ -3,7 +3,7 @@
+--+
| Zend Engine  |
+--+
-   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+--+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/Zend/acconfig.h branches/PHP_5_2/Zend/zend.c branches/PHP_5_2/Zend/zend.h branches/PHP_5_2/Zend/zend_API.c branches/PHP_5_2/Zend/zend_API.h branches/PHP_5

2010-01-05 Thread Sebastian Bergmann
sebastianTue, 05 Jan 2010 20:46:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293155

Log:
sed -i s#1998-2009#1998-2010#g **/*.c **/*.h **/*.php

Bug: http://bugs.php.net/1998 (Closed) PHP dies (segfaults) on successful 
mysql_connect
  
Changed paths:
U   php/php-src/branches/PHP_5_2/Zend/acconfig.h
U   php/php-src/branches/PHP_5_2/Zend/zend.c
U   php/php-src/branches/PHP_5_2/Zend/zend.h
U   php/php-src/branches/PHP_5_2/Zend/zend_API.c
U   php/php-src/branches/PHP_5_2/Zend/zend_API.h
U   php/php-src/branches/PHP_5_2/Zend/zend_alloc.c
U   php/php-src/branches/PHP_5_2/Zend/zend_alloc.h
U   php/php-src/branches/PHP_5_2/Zend/zend_arg_defs.c
U   php/php-src/branches/PHP_5_2/Zend/zend_builtin_functions.c
U   php/php-src/branches/PHP_5_2/Zend/zend_builtin_functions.h
U   php/php-src/branches/PHP_5_2/Zend/zend_compile.c
U   php/php-src/branches/PHP_5_2/Zend/zend_compile.h
U   php/php-src/branches/PHP_5_2/Zend/zend_config.nw.h
U   php/php-src/branches/PHP_5_2/Zend/zend_config.w32.h
U   php/php-src/branches/PHP_5_2/Zend/zend_constants.c
U   php/php-src/branches/PHP_5_2/Zend/zend_constants.h
U   php/php-src/branches/PHP_5_2/Zend/zend_default_classes.c
U   php/php-src/branches/PHP_5_2/Zend/zend_dynamic_array.c
U   php/php-src/branches/PHP_5_2/Zend/zend_dynamic_array.h
U   php/php-src/branches/PHP_5_2/Zend/zend_errors.h
U   php/php-src/branches/PHP_5_2/Zend/zend_exceptions.c
U   php/php-src/branches/PHP_5_2/Zend/zend_exceptions.h
U   php/php-src/branches/PHP_5_2/Zend/zend_execute.c
U   php/php-src/branches/PHP_5_2/Zend/zend_execute.h
U   php/php-src/branches/PHP_5_2/Zend/zend_execute_API.c
U   php/php-src/branches/PHP_5_2/Zend/zend_extensions.c
U   php/php-src/branches/PHP_5_2/Zend/zend_extensions.h
U   php/php-src/branches/PHP_5_2/Zend/zend_fast_cache.h
U   php/php-src/branches/PHP_5_2/Zend/zend_globals.h
U   php/php-src/branches/PHP_5_2/Zend/zend_globals_macros.h
U   php/php-src/branches/PHP_5_2/Zend/zend_hash.c
U   php/php-src/branches/PHP_5_2/Zend/zend_hash.h
U   php/php-src/branches/PHP_5_2/Zend/zend_highlight.c
U   php/php-src/branches/PHP_5_2/Zend/zend_highlight.h
U   php/php-src/branches/PHP_5_2/Zend/zend_indent.c
U   php/php-src/branches/PHP_5_2/Zend/zend_indent.h
U   php/php-src/branches/PHP_5_2/Zend/zend_ini.c
U   php/php-src/branches/PHP_5_2/Zend/zend_ini.h
U   php/php-src/branches/PHP_5_2/Zend/zend_ini_scanner.h
U   php/php-src/branches/PHP_5_2/Zend/zend_interfaces.c
U   php/php-src/branches/PHP_5_2/Zend/zend_interfaces.h
U   php/php-src/branches/PHP_5_2/Zend/zend_istdiostream.h
U   php/php-src/branches/PHP_5_2/Zend/zend_iterators.c
U   php/php-src/branches/PHP_5_2/Zend/zend_iterators.h
U   php/php-src/branches/PHP_5_2/Zend/zend_language_scanner.h
U   php/php-src/branches/PHP_5_2/Zend/zend_list.c
U   php/php-src/branches/PHP_5_2/Zend/zend_list.h
U   php/php-src/branches/PHP_5_2/Zend/zend_llist.c
U   php/php-src/branches/PHP_5_2/Zend/zend_llist.h
U   php/php-src/branches/PHP_5_2/Zend/zend_modules.h
U   php/php-src/branches/PHP_5_2/Zend/zend_multibyte.c
U   php/php-src/branches/PHP_5_2/Zend/zend_multibyte.h
U   php/php-src/branches/PHP_5_2/Zend/zend_multiply.h
U   php/php-src/branches/PHP_5_2/Zend/zend_object_handlers.c
U   php/php-src/branches/PHP_5_2/Zend/zend_object_handlers.h
U   php/php-src/branches/PHP_5_2/Zend/zend_objects.c
U   php/php-src/branches/PHP_5_2/Zend/zend_objects.h
U   php/php-src/branches/PHP_5_2/Zend/zend_objects_API.c
U   php/php-src/branches/PHP_5_2/Zend/zend_objects_API.h
U   php/php-src/branches/PHP_5_2/Zend/zend_opcode.c
U   php/php-src/branches/PHP_5_2/Zend/zend_operators.c
U   php/php-src/branches/PHP_5_2/Zend/zend_operators.h
U   php/php-src/branches/PHP_5_2/Zend/zend_ptr_stack.c
U   php/php-src/branches/PHP_5_2/Zend/zend_ptr_stack.h
U   php/php-src/branches/PHP_5_2/Zend/zend_qsort.c
U   php/php-src/branches/PHP_5_2/Zend/zend_qsort.h
U   php/php-src/branches/PHP_5_2/Zend/zend_sprintf.c
U   php/php-src/branches/PHP_5_2/Zend/zend_stack.c
U   php/php-src/branches/PHP_5_2/Zend/zend_stack.h
U   php/php-src/branches/PHP_5_2/Zend/zend_static_allocator.c
U   php/php-src/branches/PHP_5_2/Zend/zend_static_allocator.h
U   php/php-src/branches/PHP_5_2/Zend/zend_stream.c
U   php/php-src/branches/PHP_5_2/Zend/zend_stream.h
U   php/php-src/branches/PHP_5_2/Zend/zend_strtod.h
U   php/php-src/branches/PHP_5_2/Zend/zend_ts_hash.c
U   php/php-src/branches/PHP_5_2/Zend/zend_ts_hash.h
U   php/php-src/branches/PHP_5_2/Zend/zend_types.h
U   php/php-src/branches/PHP_5_2/Zend/zend_variables.c
U   php/php-src/branches/PHP_5_2/Zend/zend_variables.h
U   php/php-src/branches/PHP_5_2/Zend/zend_vm.h
U   

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pdo/pdo_sql_parser.re branches/PHP_5_2/ext/standard/var_unserializer.re branches/PHP_5_3/ext/pdo/pdo_sql_parser.re branches/PHP_5_3/ext/standard/var_u

2010-01-03 Thread Sebastian Bergmann
sebastianSun, 03 Jan 2010 08:22:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293035

Log:
sed -i s#1997-2009#1997-2010#g **/*.re **/*.y **/*.l

Bug: http://bugs.php.net/1997 (Bogus) Compilation Problems
  
Changed paths:
U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_sql_parser.re
U   php/php-src/branches/PHP_5_2/ext/standard/var_unserializer.re
U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re
U   php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re
U   php/php-src/branches/PHP_5_3_2/ext/pdo/pdo_sql_parser.re
U   php/php-src/branches/PHP_5_3_2/ext/standard/var_unserializer.re
U   php/php-src/trunk/ext/date/lib/parse_date.re
U   php/php-src/trunk/ext/date/lib/parse_iso_intervals.re
U   php/php-src/trunk/ext/pdo/pdo_sql_parser.re
U   php/php-src/trunk/ext/standard/var_unserializer.re

Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_sql_parser.re
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_sql_parser.re	2010-01-03 03:11:54 UTC (rev 293034)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_sql_parser.re	2010-01-03 08:22:14 UTC (rev 293035)
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2009 The PHP Group|
+  | Copyright (c) 1997-2010 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_2/ext/standard/var_unserializer.re
===
--- php/php-src/branches/PHP_5_2/ext/standard/var_unserializer.re	2010-01-03 03:11:54 UTC (rev 293034)
+++ php/php-src/branches/PHP_5_2/ext/standard/var_unserializer.re	2010-01-03 08:22:14 UTC (rev 293035)
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2009 The PHP Group|
+  | Copyright (c) 1997-2010 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re	2010-01-03 03:11:54 UTC (rev 293034)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re	2010-01-03 08:22:14 UTC (rev 293035)
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2009 The PHP Group|
+  | Copyright (c) 1997-2010 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re
===
--- php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re	2010-01-03 03:11:54 UTC (rev 293034)
+++ php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re	2010-01-03 08:22:14 UTC (rev 293035)
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2009 The PHP Group|
+  | Copyright (c) 1997-2010 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3_2/ext/pdo/pdo_sql_parser.re
===
--- php/php-src/branches/PHP_5_3_2/ext/pdo/pdo_sql_parser.re	2010-01-03 03:11:54 UTC (rev 293034)
+++ 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_setAccessible.phpt trunk/NEWS

2009-09-16 Thread Sebastian Bergmann
sebastianWed, 16 Sep 2009 17:24:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288380

Log:
Merge ReflectionMethod::setAccessible() to PHP 5.3.2, approved by Johannes.

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
A + 
php/php-src/branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_setAccessible.phpt
(from 
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_setAccessible.phpt:r288379)
U   php/php-src/trunk/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2009-09-16 17:03:44 UTC (rev 288379)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-09-16 17:24:46 UTC (rev 288380)
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.3.2
+- Added ReflectionMethod::setAccessible() for invoking non-public methods
+  through the Reflection API. (Sebastian)
 - Implemented FR #49253 (added support for libcurl's CERTINFO option).
   (Linus Nielsen Feltzing li...@haxx.se)


Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c	2009-09-16 17:03:44 UTC (rev 288379)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c	2009-09-16 17:24:46 UTC (rev 288380)
@@ -176,7 +176,6 @@
 typedef struct _property_reference {
 	zend_class_entry *ce;
 	zend_property_info prop;
-	unsigned int ignore_visibility:1;
 } property_reference;

 /* Struct for parameters */
@@ -201,6 +200,7 @@
 	reflection_type_t ref_type;
 	zval *obj;
 	zend_class_entry *ce;
+	unsigned int ignore_visibility:1;
 } reflection_object;

 static zend_object_handlers reflection_object_handlers;
@@ -1290,10 +1290,10 @@
 	reference = (property_reference*) emalloc(sizeof(property_reference));
 	reference-ce = ce;
 	reference-prop = *prop;
-	reference-ignore_visibility = 0;
 	intern-ptr = reference;
 	intern-ref_type = REF_TYPE_PROPERTY;
 	intern-ce = ce;
+	intern-ignore_visibility = 0;
 	zend_hash_update(Z_OBJPROP_P(object), name, sizeof(name), (void **) name, sizeof(zval *), NULL);
 	zend_hash_update(Z_OBJPROP_P(object), class, sizeof(class), (void **) classname, sizeof(zval *), NULL);
 }
@@ -2561,8 +2561,9 @@

 	GET_REFLECTION_OBJECT_PTR(mptr);

-	if (!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
-		|| (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+	if ((!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
+		 || (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+		  intern-ignore_visibility == 0)
 	{
 		if (mptr-common.fn_flags  ZEND_ACC_ABSTRACT) {
 			zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -2669,8 +2670,9 @@
 		return;
 	}

-	if (!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
-		|| (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+	if ((!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
+		 || (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+		  intern-ignore_visibility == 0)
 	{
 		if (mptr-common.fn_flags  ZEND_ACC_ABSTRACT) {
 			zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -2959,6 +2961,27 @@
 }
 /* }}} */

+/* {{{ proto public void ReflectionMethod::setAccessible()
+   Sets whether non-public methods can be invoked */
+ZEND_METHOD(reflection_method, setAccessible)
+{
+	reflection_object *intern;
+	zend_bool visible;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, b, visible) == FAILURE) {
+		return;
+	}
+
+	intern = (reflection_object *) zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	if (intern == NULL) {
+		return;
+	}
+
+	intern-ignore_visibility = visible;
+}
+/* }}} */
+
 /* {{{ proto public static mixed ReflectionClass::export(mixed argument [, bool return]) throws ReflectionException
Exports a reflection object. Returns the output if TRUE is specified for return, printing it otherwise. */
 ZEND_METHOD(reflection_class, export)
@@ -4375,10 +4398,10 @@
 		reference-prop = *property_info;
 	}
 	reference-ce = ce;
-	reference-ignore_visibility = 0;
 	intern-ptr = reference;
 	intern-ref_type = REF_TYPE_PROPERTY;
 	intern-ce = ce;
+	intern-ignore_visibility = 0;
 }
 /* }}} */

@@ -4491,7 +4514,7 @@
 	METHOD_NOTSTATIC(reflection_property_ptr);
 	GET_REFLECTION_OBJECT_PTR(ref);

-	if (!(ref-prop.flags  (ZEND_ACC_PUBLIC | ZEND_ACC_IMPLICIT_PUBLIC))  ref-ignore_visibility == 0) {
+	if (!(ref-prop.flags  (ZEND_ACC_PUBLIC | ZEND_ACC_IMPLICIT_PUBLIC))  intern-ignore_visibility == 0) {
 		_default_get_entry(getThis(), name, sizeof(name), name TSRMLS_CC);
 		zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
 			Cannot access non-public member %s::%s, intern-ce-name, Z_STRVAL(name));
@@ -4543,7 +4566,7 @@
 	METHOD_NOTSTATIC(reflection_property_ptr);
 	GET_REFLECTION_OBJECT_PTR(ref);

-	if 

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionMethod_setAccessible.phpt

2009-09-09 Thread Sebastian Bergmann
sebastianThu, 10 Sep 2009 05:04:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288218

Log:
Add ReflectionMethod::setAccessible() for invoking non-public methods through 
the Reflection API.

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/reflection/php_reflection.c
A   
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_setAccessible.phpt

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS	2009-09-10 05:02:52 UTC (rev 288217)
+++ php/php-src/trunk/NEWS	2009-09-10 05:04:53 UTC (rev 288218)
@@ -45,6 +45,8 @@
   (Sara)
 - Added stream_resolve_include_path() function which checks which file fopen()
   with a relative path will open. (Sara)
+- Added ReflectionMethod::setAccessible() for invoking non-public methods
+  through the Reflection API. (Sebastian)

 - Fixed bug #46647 (SplFileObject::fgetcsv segfaults). (Etienne)
 - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike)

Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===
--- php/php-src/trunk/ext/reflection/php_reflection.c	2009-09-10 05:02:52 UTC (rev 288217)
+++ php/php-src/trunk/ext/reflection/php_reflection.c	2009-09-10 05:04:53 UTC (rev 288218)
@@ -171,7 +171,6 @@
 typedef struct _property_reference {
 	zend_class_entry *ce;
 	zend_property_info prop;
-	unsigned int ignore_visibility:1;
 } property_reference;

 /* Struct for parameters */
@@ -196,6 +195,7 @@
 	reflection_type_t ref_type;
 	zval *obj;
 	zend_class_entry *ce;
+	unsigned int ignore_visibility:1;
 } reflection_object;

 static zend_object_handlers reflection_object_handlers;
@@ -1293,10 +1293,10 @@
 	reference = (property_reference*) emalloc(sizeof(property_reference));
 	reference-ce = ce;
 	reference-prop = *prop;
-	reference-ignore_visibility = 0;
 	intern-ptr = reference;
 	intern-ref_type = REF_TYPE_PROPERTY;
 	intern-ce = ce;
+	intern-ignore_visibility = 0;
 	zend_ascii_hash_update(Z_OBJPROP_P(object), name, sizeof(name), (void **) name, sizeof(zval *), NULL);
 	zend_ascii_hash_update(Z_OBJPROP_P(object), class, sizeof(class), (void **) classname, sizeof(zval *), NULL);
 }
@@ -2701,8 +2701,9 @@

 	GET_REFLECTION_OBJECT_PTR(mptr);

-	if (!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
-		|| (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+	if ((!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
+		 || (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+		  intern-ignore_visibility == 0)
 	{
 		if (mptr-common.fn_flags  ZEND_ACC_ABSTRACT) {
 			zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -2804,8 +2805,9 @@
 		return;
 	}

-	if (!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
-		|| (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+	if ((!(mptr-common.fn_flags  ZEND_ACC_PUBLIC)
+		 || (mptr-common.fn_flags  ZEND_ACC_ABSTRACT))
+		  intern-ignore_visibility == 0)
 	{
 		if (mptr-common.fn_flags  ZEND_ACC_ABSTRACT) {
 			zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -3109,6 +3111,28 @@
 }
 /* }}} */

+/* {{{ proto public void ReflectionMethod::setAccessible()
+   Sets whether non-public methods can be invoked */
+ZEND_METHOD(reflection_method, setAccessible)
+{
+	reflection_object *intern;
+	zend_bool visible;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, b, visible) == FAILURE) {
+		return;
+	}
+
+	intern = getThis();
+	intern = (reflection_object *) zend_object_store_get_object(intern TSRMLS_CC);
+
+	if (intern == NULL) {
+		return;
+	}
+
+	intern-ignore_visibility = visible;
+}
+/* }}} */
+
 /* {{{ proto public static mixed ReflectionClass::export(mixed argument [, bool return]) throws ReflectionException U
Exports a reflection object. Returns the output if TRUE is specified for return, printing it otherwise. */
 ZEND_METHOD(reflection_class, export)
@@ -4580,10 +4604,10 @@
 		reference-prop = *property_info;
 	}
 	reference-ce = ce;
-	reference-ignore_visibility = 0;
 	intern-ptr = reference;
 	intern-ref_type = REF_TYPE_PROPERTY;
 	intern-ce = ce;
+	intern-ignore_visibility = 0;
 }
 /* }}} */

@@ -4730,7 +4754,7 @@
 	METHOD_NOTSTATIC(reflection_property_ptr);
 	GET_REFLECTION_OBJECT_PTR(ref);

-	if (!(ref-prop.flags  (ZEND_ACC_PUBLIC | ZEND_ACC_IMPLICIT_PUBLIC))  ref-ignore_visibility == 0) {
+	if (!(ref-prop.flags  (ZEND_ACC_PUBLIC | ZEND_ACC_IMPLICIT_PUBLIC))  intern-ignore_visibility == 0) {
 		_default_get_entry(getThis(), name, sizeof(name), name TSRMLS_CC);
 		zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
 			Cannot access non-public member %v::%v, intern-ce-name, Z_UNIVAL(name));
@@ -4785,7 +4809,7 @@
 	METHOD_NOTSTATIC(reflection_property_ptr);
 	GET_REFLECTION_OBJECT_PTR(ref);

-	if (!(ref-prop.flags  ZEND_ACC_PUBLIC)  ref-ignore_visibility == 0) {
+	if (!(ref-prop.flags  ZEND_ACC_PUBLIC)  intern-ignore_visibility == 0) {
 		_default_get_entry(getThis(), name, sizeof(name), name 

[PHP-CVS] svn: /php/php-src/trunk/ext/reflection/ php_reflection.c

2009-09-09 Thread Sebastian Bergmann
sebastianThu, 10 Sep 2009 05:15:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288220

Log:
Use getThis() correctly.

Changed paths:
U   php/php-src/trunk/ext/reflection/php_reflection.c

Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===
--- php/php-src/trunk/ext/reflection/php_reflection.c   2009-09-10 05:07:22 UTC 
(rev 288219)
+++ php/php-src/trunk/ext/reflection/php_reflection.c   2009-09-10 05:15:24 UTC 
(rev 288220)
@@ -3122,8 +3122,7 @@
return;
}

-   intern = getThis();
-   intern = (reflection_object *) zend_object_store_get_object(intern 
TSRMLS_CC);
+   intern = (reflection_object *) zend_object_store_get_object(getThis() 
TSRMLS_CC);

if (intern == NULL) {
return;
@@ -4934,8 +4933,7 @@
return;
}

-   intern = getThis();
-   intern = (reflection_object *) zend_object_store_get_object(intern 
TSRMLS_CC);
+   intern = (reflection_object *) zend_object_store_get_object(getThis() 
TSRMLS_CC);

if (intern == NULL) {
return;

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/reflection/php_reflection.c branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt branches/PHP_5_3/ext/reflection/php_reflecti

2009-09-03 Thread Sebastian Bergmann
sebastianThu, 03 Sep 2009 14:02:51 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287991

Log:
Make invokeArgs() error messages consistent with invoke().

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
U   
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
U   php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
U   
php/php-src/branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
U   php/php-src/trunk/ext/reflection/php_reflection.c
U   
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt

Modified: php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
2009-09-03 12:58:31 UTC (rev 287990)
+++ php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
2009-09-03 14:02:51 UTC (rev 287991)
@@ -2422,11 +2422,11 @@
(mptr-common.fn_flags  ZEND_ACC_ABSTRACT)) {
if (mptr-common.fn_flags  ZEND_ACC_ABSTRACT) {
zend_throw_exception_ex(reflection_exception_ptr, 0 
TSRMLS_CC,
-   Trying to invoke abstract method %s::%s,
+   Trying to invoke abstract method %s::%s(),
mptr-common.scope-name, 
mptr-common.function_name);
} else {
zend_throw_exception_ex(reflection_exception_ptr, 0 
TSRMLS_CC,
-   Trying to invoke %s method %s::%s from scope 
%s,
+   Trying to invoke %s method %s::%s() from scope 
%s,
mptr-common.fn_flags  ZEND_ACC_PROTECTED ? 
protected : private,
mptr-common.scope-name, 
mptr-common.function_name,
Z_OBJCE_P(getThis())-name);
@@ -2453,7 +2453,7 @@
if (!object) {
efree(params);
zend_throw_exception_ex(reflection_exception_ptr, 0 
TSRMLS_CC,
-   Trying to invoke non static method %s::%s 
without an object,
+   Trying to invoke non static method %s::%s() 
without an object,
mptr-common.scope-name, 
mptr-common.function_name);
return;
}

Modified: 
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
===
--- 
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
   2009-09-03 12:58:31 UTC (rev 287990)
+++ 
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
   2009-09-03 14:02:51 UTC (rev 287991)
@@ -111,9 +111,9 @@
 NULL

 Private method:
-string(84) Trying to invoke private method TestClass::privateMethod from 
scope ReflectionMethod
+string(86) Trying to invoke private method TestClass::privateMethod() from 
scope ReflectionMethod

 Abstract method:
-string(51) Trying to invoke abstract method AbstractClass::foo
+string(53) Trying to invoke abstract method AbstractClass::foo()

 Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 1 given 
in %s on line %d

Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2009-09-03 12:58:31 UTC (rev 287990)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2009-09-03 14:02:51 UTC (rev 287991)
@@ -2674,11 +2674,11 @@
{
if (mptr-common.fn_flags  ZEND_ACC_ABSTRACT) {
zend_throw_exception_ex(reflection_exception_ptr, 0 
TSRMLS_CC,
-   Trying to invoke abstract method %s::%s,
+   Trying to invoke abstract method %s::%s(),
mptr-common.scope-name, 
mptr-common.function_name);
} else {
zend_throw_exception_ex(reflection_exception_ptr, 0 
TSRMLS_CC,
-   Trying to invoke %s method %s::%s from scope 
%s,
+   Trying to invoke %s method %s::%s() from scope 
%s,
mptr-common.fn_flags  ZEND_ACC_PROTECTED ? 
protected : private,
mptr-common.scope-name, 
mptr-common.function_name,
Z_OBJCE_P(getThis())-name);
@@ -2705,7 +2705,7 @@
if (!object) {
efree(params);
zend_throw_exception_ex(reflection_exception_ptr, 0 
TSRMLS_CC,
-   

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-04-16 Thread Sebastian Bergmann
sebastian   Thu Apr 16 06:47:37 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Fugbix typo.
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.558r2=1.2027.2.547.2.965.2.559diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.558 
php-src/NEWS:1.2027.2.547.2.965.2.559
--- php-src/NEWS:1.2027.2.547.2.965.2.558   Tue Apr 14 15:48:37 2009
+++ php-src/NEWSThu Apr 16 06:47:36 2009
@@ -525,7 +525,7 @@
   . Added pcntl_sigtimedwait().
 
 - Improved SOAP extension:
-  . Added support for element names in context of XMLShema's any. (Dmitry)
+  . Added support for element names in context of XMLSchema's any. (Dmitry)
   . Added ability to use Traversable objects instead of plain arrays.
 (Joshua Reese, Dmitry)
   . Fixed possible crash bug caused by an uninitialized value. (Zdash Urf)



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



[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests reflectionProperty_setAccessible.phpt

2009-04-04 Thread Sebastian Bergmann
sebastian   Sat Apr  4 14:35:29 2009 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
/php-src/ext/reflection/tests   reflectionProperty_setAccessible.phpt 
  Log:
  Fix issue reported by Roman Borschel.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.341r2=1.342diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.341 
php-src/ext/reflection/php_reflection.c:1.342
--- php-src/ext/reflection/php_reflection.c:1.341   Thu Mar 26 20:01:57 2009
+++ php-src/ext/reflection/php_reflection.c Sat Apr  4 14:35:28 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.341 2009/03/26 20:01:57 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.342 2009/04/04 14:35:28 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4726,7 +4726,7 @@
}
zend_u_unmangle_property_name(IS_UNICODE, ref-prop.name, 
ref-prop.name_length, class_name, prop_name);
prop_name_len = u_strlen(prop_name.u);
-   member_p = zend_u_read_property(Z_OBJCE_P(object), object, 
IS_UNICODE, prop_name, prop_name_len, 1 TSRMLS_CC);
+   member_p = zend_u_read_property(ref-ce, object, IS_UNICODE, 
prop_name, prop_name_len, 1 TSRMLS_CC);
*return_value= *member_p;
zval_copy_ctor(return_value);
INIT_PZVAL(return_value);
@@ -4807,7 +4807,7 @@
}
zend_u_unmangle_property_name(IS_UNICODE, ref-prop.name, 
ref-prop.name_length, class_name, prop_name);
prop_name_len = u_strlen(prop_name.u);
-   zend_u_update_property(Z_OBJCE_P(object), object, IS_UNICODE, 
prop_name, prop_name_len, value TSRMLS_CC);
+   zend_u_update_property(ref-ce, object, IS_UNICODE, prop_name, 
prop_name_len, value TSRMLS_CC);
}
 }
 /* }}} */
@@ -5680,7 +5680,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Revision: 1.341 $);
+   php_info_print_table_row(2, Version, $Revision: 1.342 $);
 
php_info_print_table_end();
 } /* }}} */
@@ -5694,7 +5694,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
-   $Revision: 1.341 $,
+   $Revision: 1.342 $,
STANDARD_MODULE_PROPERTIES
 }; /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt
diff -u php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.3 
php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.4
--- php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.3  
Sat Nov 29 15:58:30 2008
+++ php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt  Sat Apr 
 4 14:35:28 2009
@@ -9,6 +9,8 @@
 private static $privateStatic = 'd';
 }
 
+class B extends A {}
+
 $a   = new A;
 $protected   = new ReflectionProperty($a, 'protected');
 $protectedStatic = new ReflectionProperty('A', 'protectedStatic');
@@ -66,6 +68,52 @@
 var_dump($protectedStatic-getValue());
 var_dump($private-getValue($a));
 var_dump($privateStatic-getValue());
+
+$a   = new A;
+$b   = new B;
+$protected   = new ReflectionProperty($b, 'protected');
+$protectedStatic = new ReflectionProperty('B', 'protectedStatic');
+$private = new ReflectionProperty($a, 'private');
+
+try {
+var_dump($protected-getValue($b));
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
+
+try {
+var_dump($protectedStatic-getValue());
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
+
+try {
+var_dump($private-getValue($b));
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
+
+$protected-setAccessible(TRUE);
+$protectedStatic-setAccessible(TRUE);
+$private-setAccessible(TRUE);
+
+var_dump($protected-getValue($b));
+var_dump($protectedStatic-getValue());
+var_dump($private-getValue($b));
+
+$protected-setValue($b, 'e');
+$protectedStatic-setValue('f');
+$private-setValue($b, 'g');
+
+var_dump($protected-getValue($b));
+var_dump($protectedStatic-getValue());
+var_dump($private-getValue($b));
 ?
 --EXPECT--
 unicode(44) Cannot access non-public member A::protected
@@ -80,3 +128,12 @@
 unicode(1) f
 unicode(1) g
 unicode(1) h
+unicode(44) Cannot access non-public member B::protected
+unicode(50) Cannot access non-public member B::protectedStatic
+unicode(42) Cannot access non-public member A::private
+unicode(1) a
+unicode(1) f
+unicode(1) c
+unicode(1) e
+unicode(1) f
+unicode(1) g



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



[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests reflectionProperty_setAccessible.phpt

2009-04-04 Thread Sebastian Bergmann
sebastian   Sat Apr  4 14:36:23 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/reflection php_reflection.c 
/php-src/ext/reflection/tests   reflectionProperty_setAccessible.phpt 
/php-srcNEWS 
  Log:
  MFH: Fix issue reported by Roman Borschel.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.54r2=1.164.2.33.2.45.2.55diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.54 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.55
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.54Thu Apr 
 2 21:30:09 2009
+++ php-src/ext/reflection/php_reflection.c Sat Apr  4 14:36:22 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.54 2009/04/02 21:30:09 iliaa Exp 
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.55 2009/04/04 14:36:22 sebastian 
Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4491,7 +4491,7 @@
return;
}
zend_unmangle_property_name(ref-prop.name, 
ref-prop.name_length, class_name, prop_name);
-   member_p = zend_read_property(Z_OBJCE_P(object), object, 
prop_name, strlen(prop_name), 1 TSRMLS_CC);
+   member_p = zend_read_property(ref-ce, object, prop_name, 
strlen(prop_name), 1 TSRMLS_CC);
*return_value= *member_p;
zval_copy_ctor(return_value);
INIT_PZVAL(return_value);
@@ -4569,7 +4569,7 @@
return;
}
zend_unmangle_property_name(ref-prop.name, 
ref-prop.name_length, class_name, prop_name);
-   zend_update_property(Z_OBJCE_P(object), object, prop_name, 
strlen(prop_name), value TSRMLS_CC);
+   zend_update_property(ref-ce, object, prop_name, 
strlen(prop_name), value TSRMLS_CC);
}
 }
 /* }}} */
@@ -5437,7 +5437,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.54 
$);
+   php_info_print_table_row(2, Version, $Revision: 1.164.2.33.2.45.2.55 
$);
 
php_info_print_table_end();
 } /* }}} */
@@ -5451,7 +5451,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
-   $Revision: 1.164.2.33.2.45.2.54 $,
+   $Revision: 1.164.2.33.2.45.2.55 $,
STANDARD_MODULE_PROPERTIES
 }; /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt
diff -u 
php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.1.2.4 
php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.1.2.5
--- php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.1.2.4  
Sat Nov 29 15:58:54 2008
+++ php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt  Sat Apr 
 4 14:36:23 2009
@@ -9,6 +9,8 @@
 private static $privateStatic = 'd';
 }
 
+class B extends A {}
+
 $a   = new A;
 $protected   = new ReflectionProperty($a, 'protected');
 $protectedStatic = new ReflectionProperty('A', 'protectedStatic');
@@ -66,6 +68,52 @@
 var_dump($protectedStatic-getValue());
 var_dump($private-getValue($a));
 var_dump($privateStatic-getValue());
+
+$a   = new A;
+$b   = new B;
+$protected   = new ReflectionProperty($b, 'protected');
+$protectedStatic = new ReflectionProperty('B', 'protectedStatic');
+$private = new ReflectionProperty($a, 'private');
+
+try {
+var_dump($protected-getValue($b));
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
+
+try {
+var_dump($protectedStatic-getValue());
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
+
+try {
+var_dump($private-getValue($b));
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
+
+$protected-setAccessible(TRUE);
+$protectedStatic-setAccessible(TRUE);
+$private-setAccessible(TRUE);
+
+var_dump($protected-getValue($b));
+var_dump($protectedStatic-getValue());
+var_dump($private-getValue($b));
+
+$protected-setValue($b, 'e');
+$protectedStatic-setValue('f');
+$private-setValue($b, 'g');
+
+var_dump($protected-getValue($b));
+var_dump($protectedStatic-getValue());
+var_dump($private-getValue($b));
 ?
 --EXPECT--
 string(44) Cannot access non-public member A::protected
@@ -80,3 +128,12 @@
 string(1) f
 string(1) g
 string(1) h
+string(44) Cannot access non-public member B::protected
+string(50) Cannot access non-public member B::protectedStatic
+string(42) Cannot access non-public member A::private
+string(1) a
+string(1) f
+string(1) c
+string(1) e
+string(1) f
+string(1) g

[PHP-CVS] cvs: php-src /ext/pdo pdo_sql_parser.re /ext/phar phar_path_check.re

2008-12-31 Thread Sebastian Bergmann
sebastian   Wed Dec 31 11:10:02 2008 UTC

  Modified files:  
/php-src/ext/pdopdo_sql_parser.re 
/php-src/ext/phar   phar_path_check.re 
  Log:
  Bump copyright year, 2 of 3.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.48r2=1.49diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.48 
php-src/ext/pdo/pdo_sql_parser.re:1.49
--- php-src/ext/pdo/pdo_sql_parser.re:1.48  Thu Nov 13 18:14:31 2008
+++ php-src/ext/pdo/pdo_sql_parser.re   Wed Dec 31 11:10:02 2008
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2008 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.re,v 1.48 2008/11/13 18:14:31 felipe Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.49 2008/12/31 11:10:02 sebastian Exp $ */
 
 #include php.h
 #include php_pdo_driver.h
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_path_check.re?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/phar/phar_path_check.re
diff -u php-src/ext/phar/phar_path_check.re:1.9 
php-src/ext/phar/phar_path_check.re:1.10
--- php-src/ext/phar/phar_path_check.re:1.9 Fri Aug  1 13:45:05 2008
+++ php-src/ext/phar/phar_path_check.re Wed Dec 31 11:10:02 2008
@@ -2,7 +2,7 @@
   +--+
   | phar php single-file executable PHP extension|
   +--+
-  | Copyright (c) 2007-2008 The PHP Group|
+  | Copyright (c) 2007-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: phar_path_check.re,v 1.9 2008/08/01 13:45:05 sfox Exp $ */
+/* $Id: phar_path_check.re,v 1.10 2008/12/31 11:10:02 sebastian Exp $ */
 
 #include phar_internal.h
 



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_sql_parser.re /ext/phar phar_path_check.re

2008-12-31 Thread Sebastian Bergmann
sebastian   Wed Dec 31 11:13:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdopdo_sql_parser.re 
/php-src/ext/phar   phar_path_check.re 
  Log:
  MFH: Bump copyright year, 2 of 3.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.9.2.7r2=1.28.2.4.2.9.2.8diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.7 
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.8
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.7  Thu Nov 13 18:14:50 2008
+++ php-src/ext/pdo/pdo_sql_parser.re   Wed Dec 31 11:13:54 2008
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2008 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.7 2008/11/13 18:14:50 felipe Exp $ 
*/
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.8 2008/12/31 11:13:54 sebastian Exp 
$ */
 
 #include php.h
 #include php_pdo_driver.h
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_path_check.re?r1=1.8.2.1r2=1.8.2.2diff_format=u
Index: php-src/ext/phar/phar_path_check.re
diff -u php-src/ext/phar/phar_path_check.re:1.8.2.1 
php-src/ext/phar/phar_path_check.re:1.8.2.2
--- php-src/ext/phar/phar_path_check.re:1.8.2.1 Fri Aug  1 13:48:44 2008
+++ php-src/ext/phar/phar_path_check.re Wed Dec 31 11:13:54 2008
@@ -2,7 +2,7 @@
   +--+
   | phar php single-file executable PHP extension|
   +--+
-  | Copyright (c) 2007-2008 The PHP Group|
+  | Copyright (c) 2007-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: phar_path_check.re,v 1.8.2.1 2008/08/01 13:48:44 sfox Exp $ */
+/* $Id: phar_path_check.re,v 1.8.2.2 2008/12/31 11:13:54 sebastian Exp $ */
 
 #include phar_internal.h
 



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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_sql_parser.re

2008-12-31 Thread Sebastian Bergmann
sebastian   Wed Dec 31 11:16:23 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdopdo_sql_parser.re 
  Log:
  MFH: Bump copyright year, 2 of 3.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.17r2=1.28.2.4.2.18diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.17 
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.18
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.17 Thu Nov 13 23:23:11 2008
+++ php-src/ext/pdo/pdo_sql_parser.re   Wed Dec 31 11:16:23 2008
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2008 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.17 2008/11/13 23:23:11 felipe Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.18 2008/12/31 11:16:23 sebastian Exp $ 
*/
 
 #include php.h
 #include php_pdo_driver.h



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



[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2008-11-30 Thread Sebastian Bergmann
sebastian   Sun Nov 30 10:33:10 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Update ReflectionProperty::setAccessible() entry.
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.393r2=1.2027.2.547.2.965.2.394diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.393 
php-src/NEWS:1.2027.2.547.2.965.2.394
--- php-src/NEWS:1.2027.2.547.2.965.2.393   Fri Nov 28 14:20:57 2008
+++ php-src/NEWSSun Nov 30 10:33:09 2008
@@ -402,7 +402,8 @@
 
 - Added array_replace() and array_replace_recursive() functions. (Matt)
 - Added ReflectionProperty::setAccessible() method that allows non-public
-  property's values to be read through ::getValue(). (Derick)
+  property's values to be read through ::getValue() and set through
+  ::setValue(). (Derick, Sebastian)
 - Added msg_queue_exists() function to sysvmsg extension. (Benjamin Schulz)
 - Added Firebird specific attributes that can be set via PDO::setAttribute()
   to control formatting of date/timestamp columns: PDO::FB_ATTR_DATE_FORMAT,



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



[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests reflectionProperty_setAccessible.phpt

2008-11-29 Thread Sebastian Bergmann
sebastian   Sat Nov 29 15:58:30 2008 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
/php-src/ext/reflection/tests   reflectionProperty_setAccessible.phpt 
  Log:
  Fix #46718: ReflectionProperty::setValue() and 
ReflectionProperty::setAccessible().
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.327r2=1.328diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.327 
php-src/ext/reflection/php_reflection.c:1.328
--- php-src/ext/reflection/php_reflection.c:1.327   Thu Nov 27 19:02:45 2008
+++ php-src/ext/reflection/php_reflection.c Sat Nov 29 15:58:29 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.327 2008/11/27 19:02:45 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.328 2008/11/29 15:58:29 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4537,7 +4537,7 @@
METHOD_NOTSTATIC(reflection_property_ptr);
GET_REFLECTION_OBJECT_PTR(ref);
 
-   if (!(ref-prop.flags  ZEND_ACC_PUBLIC)) {
+   if (!(ref-prop.flags  ZEND_ACC_PUBLIC)  ref-ignore_visibility == 
0) {
_default_get_entry(getThis(), name, sizeof(name), name 
TSRMLS_CC);
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Cannot access non-public member %v::%v, 
intern-ce-name, Z_UNIVAL(name));
@@ -4581,10 +4581,15 @@
zend_u_hash_quick_update(prop_table, utype, 
ref-prop.name, ref-prop.name_length+1, ref-prop.h, value, sizeof(zval *), 
(void **) foo);
}
} else {
+   zstr class_name, prop_name;
+   int prop_name_len;
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, oz, 
object, value) == FAILURE) {
return;
}
-   zend_u_update_property(Z_OBJCE_P(object), object, 
UG(unicode)?IS_UNICODE:IS_STRING, ref-prop.name, ref-prop.name_length, value 
TSRMLS_CC);
+   zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, 
ref-prop.name, ref-prop.name_length, class_name, prop_name);
+   prop_name_len = UG(unicode) ? u_strlen(prop_name.u) : 
strlen(prop_name.s);
+   zend_u_update_property(Z_OBJCE_P(object), object, 
UG(unicode)?IS_UNICODE:IS_STRING, prop_name, prop_name_len, value TSRMLS_CC);
}
 }
 /* }}} */
@@ -5433,7 +5438,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.327 
2008/11/27 19:02:45 dmitry Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.328 
2008/11/29 15:58:29 sebastian Exp $);
 
php_info_print_table_end();
 } /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt
diff -u php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.2 
php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.3
--- php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.2  
Sat May 24 13:35:03 2008
+++ php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt  Sat Nov 
29 15:58:30 2008
@@ -2,43 +2,81 @@
 Test ReflectionProperty::setAccessible().
 --FILE--
 ?php
-
-class TestClass {
-public $pub;
-public $pub2 = 5;
-static public $stat = static property;
-protected $prot = 4;
-private $priv = keepOut;
+class A {
+protected $protected = 'a';
+protected static $protectedStatic = 'b';
+private $private = 'c';
+private static $privateStatic = 'd';
 }
 
-class AnotherClass {
+$a   = new A;
+$protected   = new ReflectionProperty($a, 'protected');
+$protectedStatic = new ReflectionProperty('A', 'protectedStatic');
+$private = new ReflectionProperty($a, 'private');
+$privateStatic   = new ReflectionProperty('A', 'privateStatic');
+
+try {
+var_dump($protected-getValue($a));
 }
 
-$instance = new TestClass();
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
 
-echo \nProtected property:\n;
-$propInfo = new ReflectionProperty('TestClass', 'prot');
 try {
-var_dump($propInfo-getValue($instance));
+var_dump($protectedStatic-getValue());
 }
-catch(Exception $exc) {
-echo $exc-getMessage(), \n;
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
 }
 
-$propInfo-setAccessible(true);
-var_dump($propInfo-getValue($instance));
+try {
+var_dump($private-getValue($a));
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
 
-$propInfo-setAccessible(false);
 try {
-var_dump($propInfo-getValue($instance));
+var_dump($privateStatic-getValue());
 }
-catch(Exception 

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c /ext/reflection/tests reflectionProperty_setAccessible.phpt

2008-11-29 Thread Sebastian Bergmann
sebastian   Sat Nov 29 15:58:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/reflection php_reflection.c 
/php-src/ext/reflection/tests   reflectionProperty_setAccessible.phpt 
  Log:
  MFH: Fix #46718: ReflectionProperty::setValue() and 
ReflectionProperty::setAccessible().
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.42r2=1.164.2.33.2.45.2.43diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.42 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.43
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.42Thu Nov 
27 19:01:22 2008
+++ php-src/ext/reflection/php_reflection.c Sat Nov 29 15:58:54 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.42 2008/11/27 19:01:22 dmitry Exp 
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.43 2008/11/29 15:58:54 sebastian 
Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4365,7 +4365,7 @@
METHOD_NOTSTATIC(reflection_property_ptr);
GET_REFLECTION_OBJECT_PTR(ref);
 
-   if (!(ref-prop.flags  ZEND_ACC_PUBLIC)) {
+   if (!(ref-prop.flags  ZEND_ACC_PUBLIC)  ref-ignore_visibility == 
0) {
_default_get_entry(getThis(), name, sizeof(name), name 
TSRMLS_CC);
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
Cannot access non-public member %s::%s, 
intern-ce-name, Z_STRVAL(name));
@@ -4409,10 +4409,13 @@
zend_hash_quick_update(prop_table, ref-prop.name, 
ref-prop.name_length+1, ref-prop.h, value, sizeof(zval *), (void **) foo);
}
} else {
+   char *class_name, *prop_name;
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, oz, 
object, value) == FAILURE) {
return;
}
-   zend_update_property(Z_OBJCE_P(object), object, ref-prop.name, 
ref-prop.name_length, value TSRMLS_CC);
+   zend_unmangle_property_name(ref-prop.name, 
ref-prop.name_length, class_name, prop_name);
+   zend_update_property(Z_OBJCE_P(object), object, prop_name, 
strlen(prop_name), value TSRMLS_CC);
}
 }
 /* }}} */
@@ -5259,7 +5262,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.45.2.42 2008/11/27 19:01:22 dmitry Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.45.2.43 2008/11/29 15:58:54 sebastian Exp $);
 
php_info_print_table_end();
 } /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt
diff -u 
php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.1.2.3 
php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.1.2.4
--- php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt:1.1.2.3  
Sat May 24 13:34:22 2008
+++ php-src/ext/reflection/tests/reflectionProperty_setAccessible.phpt  Sat Nov 
29 15:58:54 2008
@@ -2,43 +2,81 @@
 Test ReflectionProperty::setAccessible().
 --FILE--
 ?php
-
-class TestClass {
-public $pub;
-public $pub2 = 5;
-static public $stat = static property;
-protected $prot = 4;
-private $priv = keepOut;
+class A {
+protected $protected = 'a';
+protected static $protectedStatic = 'b';
+private $private = 'c';
+private static $privateStatic = 'd';
 }
 
-class AnotherClass {
+$a   = new A;
+$protected   = new ReflectionProperty($a, 'protected');
+$protectedStatic = new ReflectionProperty('A', 'protectedStatic');
+$private = new ReflectionProperty($a, 'private');
+$privateStatic   = new ReflectionProperty('A', 'privateStatic');
+
+try {
+var_dump($protected-getValue($a));
 }
 
-$instance = new TestClass();
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
 
-echo \nProtected property:\n;
-$propInfo = new ReflectionProperty('TestClass', 'prot');
 try {
-var_dump($propInfo-getValue($instance));
+var_dump($protectedStatic-getValue());
 }
-catch(Exception $exc) {
-echo $exc-getMessage(), \n;
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
 }
 
-$propInfo-setAccessible(true);
-var_dump($propInfo-getValue($instance));
+try {
+var_dump($private-getValue($a));
+}
+
+catch (ReflectionException $e) {
+var_dump($e-getMessage());
+}
 
-$propInfo-setAccessible(false);
 try {
-var_dump($propInfo-getValue($instance));
+var_dump($privateStatic-getValue());
 }
-catch(Exception $exc) {
-echo $exc-getMessage(), \n;
+
+catch 

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json json.c

2008-08-22 Thread Sebastian Bergmann
sebastian   Fri Aug 22 08:17:02 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/json   json.c 
  Log:
  Fix ZTS build.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.22r2=1.9.2.23diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.22 php-src/ext/json/json.c:1.9.2.23
--- php-src/ext/json/json.c:1.9.2.22Thu Aug 21 18:10:48 2008
+++ php-src/ext/json/json.c Fri Aug 22 08:17:02 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: json.c,v 1.9.2.22 2008/08/21 18:10:48 stas Exp $ */
+/* $Id: json.c,v 1.9.2.23 2008/08/22 08:17:02 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -84,7 +84,7 @@
 /* }}} */
 
 static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC);
-static void json_escape_string(smart_str *buf, char *s, int len);
+static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC);
 
 static int json_determine_array_type(zval **val TSRMLS_DC)  /* {{{ */
 {
@@ -190,7 +190,7 @@
 need_comma = 1;
 }
 
-json_escape_string(buf, key, key_len - 1);
+json_escape_string(buf, key, key_len - 1 TSRMLS_CC);
 smart_str_appendc(buf, ':');
 
 json_encode_r(buf, *data TSRMLS_CC);
@@ -230,7 +230,7 @@
 
 #define REVERSE16(us) (((us  0xf)  12) | (((us  4)  0xf)  8) | (((us 
 8)  0xf)  4) | ((us  12)  0xf))
 
-static void json_escape_string(smart_str *buf, char *s, int len) /* {{{ */
+static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC) /* 
{{{ */
 {
 int pos = 0;
 unsigned short us;
@@ -375,7 +375,7 @@
 }
 break;
 case IS_STRING:
-json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val));
+json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val) 
TSRMLS_CC);
 break;
 case IS_ARRAY:
 case IS_OBJECT:



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c

2008-06-22 Thread Sebastian Bergmann
sebastian   Sun Jun 22 08:06:48 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gd gd.c 
  Log:
  Fix build.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.6r2=1.312.2.20.2.32.2.7diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.6 
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.7
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.6 Sat Jun 21 22:07:52 2008
+++ php-src/ext/gd/gd.c Sun Jun 22 08:06:48 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.312.2.20.2.32.2.6 2008/06/21 22:07:52 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.7 2008/06/22 08:06:48 sebastian Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -4542,7 +4542,7 @@
ZEND_WRONG_PARAM_COUNT();
}

-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, srl|lld, str, 
str_len fnt, sz, sp, wd, angle) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, srl|lld, str, 
str_len, fnt, sz, sp, wd, angle) == FAILURE) {
return;
}




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



[PHP-CVS] cvs: php-src /ext/spl/tests fileobject_005.phpt

2008-05-25 Thread Sebastian Bergmann
sebastian   Sun May 25 06:03:45 2008 UTC

  Modified files:  
/php-src/ext/spl/tests  fileobject_005.phpt 
  Log:
  Drop SKIPIF check for ext/spl.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_005.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/fileobject_005.phpt
diff -u php-src/ext/spl/tests/fileobject_005.phpt:1.1 
php-src/ext/spl/tests/fileobject_005.phpt:1.2
--- php-src/ext/spl/tests/fileobject_005.phpt:1.1   Sat May 24 16:48:15 2008
+++ php-src/ext/spl/tests/fileobject_005.phpt   Sun May 25 06:03:44 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject truncate tests
---SKIPIF--
-?php if (!extension_loaded(spl)) print skip; ?
 --CREDITS--
 Mark Ammann
 #Hackday Webtuesday 2008-05-24



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests fileobject_005.phpt

2008-05-25 Thread Sebastian Bergmann
sebastian   Sun May 25 06:05:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/tests  fileobject_005.phpt 
  Log:
  MFH: Drop SKIPIF check for ext/spl.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_005.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/spl/tests/fileobject_005.phpt
diff -u php-src/ext/spl/tests/fileobject_005.phpt:1.1.2.2 
php-src/ext/spl/tests/fileobject_005.phpt:1.1.2.3
--- php-src/ext/spl/tests/fileobject_005.phpt:1.1.2.2   Sat May 24 16:49:04 2008
+++ php-src/ext/spl/tests/fileobject_005.phpt   Sun May 25 06:05:57 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject truncate tests
---SKIPIF--
-?php if (!extension_loaded(spl)) print skip; ?
 --CREDITS--
 Mark Ammann
 #Hackday Webtuesday 2008-05-24



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



[PHP-CVS] cvs: php-src /ext/spl/tests regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt

2008-05-24 Thread Sebastian Bergmann
sebastian   Sat May 24 14:17:44 2008 UTC

  Modified files:  
/php-src/ext/spl/tests  regexIterator_flags_basic.phpt 
regexIterator_mode_basic.phpt 
regexIterator_setMode_error.phpt 
  Log:
  Drop SKIPIF check for ext/spl.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_flags_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/regexIterator_flags_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.2 
php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.3
--- php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.2Sat May 24 
13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_flags_basic.phptSat May 24 
14:17:44 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::getFlags() and setFlags() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_mode_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/regexIterator_mode_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.2 
php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.3
--- php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.2 Sat May 24 
13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_mode_basic.phpt Sat May 24 14:17:44 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::getMode() and setMode() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt
diff -u php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.2 
php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.3
--- php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.2  Sat May 24 
13:40:33 2008
+++ php-src/ext/spl/tests/regexIterator_setMode_error.phpt  Sat May 24 
14:17:44 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::setMode() error tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
 --FILE--



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests regexIterator_flags_basic.phpt regexIterator_mode_basic.phpt regexIterator_setMode_error.phpt

2008-05-24 Thread Sebastian Bergmann
sebastian   Sat May 24 14:17:55 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/tests  regexIterator_flags_basic.phpt 
regexIterator_mode_basic.phpt 
regexIterator_setMode_error.phpt 
  Log:
  MFH: Drop SKIPIF check for ext/spl.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_flags_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_flags_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.1.2.1 
php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.1.2.2
--- php-src/ext/spl/tests/regexIterator_flags_basic.phpt:1.1.2.1Sat May 
24 13:25:24 2008
+++ php-src/ext/spl/tests/regexIterator_flags_basic.phptSat May 24 
14:17:55 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::getFlags() and setFlags() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_mode_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_mode_basic.phpt
diff -u php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.1.2.1 
php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.1.2.2
--- php-src/ext/spl/tests/regexIterator_mode_basic.phpt:1.1.2.1 Sat May 24 
13:25:24 2008
+++ php-src/ext/spl/tests/regexIterator_mode_basic.phpt Sat May 24 14:17:55 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::getMode() and setMode() basic tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt
diff -u php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.1.2.1 
php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.1.2.2
--- php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.1.2.1  Sat May 
24 13:25:24 2008
+++ php-src/ext/spl/tests/regexIterator_setMode_error.phpt  Sat May 24 
14:17:55 2008
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::setMode() error tests
---SKIPIF--
-?php extension_loaded('spl') or die('skip'); ?
 --CREDITS--
 Felix De Vliegher [EMAIL PROTECTED]
 --FILE--



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests testclass

2008-05-24 Thread Sebastian Bergmann
sebastian   Sat May 24 14:14:28 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/tests  testclass 
  Log:
  MFH: dos2unix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/testclass?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/spl/tests/testclass
diff -u php-src/ext/spl/tests/testclass:1.1 
php-src/ext/spl/tests/testclass:1.1.6.1
--- php-src/ext/spl/tests/testclass:1.1 Wed Mar  2 01:14:41 2005
+++ php-src/ext/spl/tests/testclass Sat May 24 14:14:28 2008
@@ -1,5 +1,5 @@
-?php
-
-echo __FILE__ . \n;
-
+?php
+
+echo __FILE__ . \n;
+
 ?
\ No newline at end of file



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



[PHP-CVS] cvs: php-src /ext/reflection/tests 001.phpt 002.phpt 004.phpt bug26695.phpt bug29268.phpt bug29523.phpt bug29828.phpt bug30146.phpt bug30148.phpt bug30856.phpt bug30961.phpt bug33312.phpt bu

2008-05-10 Thread Sebastian Bergmann
sebastian   Sun May 11 04:52:42 2008 UTC

  Modified files:  
/php-src/ext/reflection/tests   001.phpt 002.phpt 004.phpt 
bug26695.phpt bug29268.phpt 
bug29523.phpt bug29828.phpt 
bug30146.phpt bug30148.phpt 
bug30856.phpt bug30961.phpt 
bug33312.phpt bug37964.phpt 
bug38942.phpt parameters_001.phpt 
reflectionClass_constructor_002.phpt 
reflectionClass_getConstant_basic.phpt 
  Log:
  dos2unix *.phpt
  http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/001.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/reflection/tests/001.phpt
diff -u php-src/ext/reflection/tests/001.phpt:1.3 
php-src/ext/reflection/tests/001.phpt:1.4
--- php-src/ext/reflection/tests/001.phpt:1.3   Sun Mar 12 12:11:22 2006
+++ php-src/ext/reflection/tests/001.phpt   Sun May 11 04:52:42 2008
@@ -1,102 +1,102 @@
---TEST--
-Reflection inheritance
---SKIPIF--
-?php extension_loaded('reflection') or die('skip'); ?
---FILE--
-?php
-
-class ReflectionClassEx extends ReflectionClass
-{
-   public $bla;
-
-   function getMethodNames()
-   {
-   $res = array();
-   foreach($this-getMethods() as $m)
-   {
-   $res[] = $m-class . '::' . $m-name;
-   }
-   return $res;
-   }
-}
-
-$r = new ReflectionClassEx('ReflectionClassEx');
-
-$exp = array (
-  'UMLClass::__clone',
-  'UMLClass::export',
-  'UMLClass::__construct',
-  'UMLClass::__toString',
-  'UMLClass::getName',
-  'UMLClass::isInternal',
-  'UMLClass::isUserDefined',
-  'UMLClass::isInstantiable',
-  'UMLClass::getFileName',
-  'UMLClass::getStartLine',
-  'UMLClass::getEndLine',
-  'UMLClass::getDocComment',
-  'UMLClass::getConstructor',
-  'UMLClass::getMethod',
-  'UMLClass::getMethods',
-  'UMLClass::getProperty',
-  'UMLClass::getProperties',
-  'UMLClass::getConstants',
-  'UMLClass::getConstant',
-  'UMLClass::getInterfaces',
-  'UMLClass::isInterface',
-  'UMLClass::isAbstract',
-  'UMLClass::isFinal',
-  'UMLClass::getModifiers',
-  'UMLClass::isInstance',
-  'UMLClass::newInstance',
-  'UMLClass::getParentClass',
-  'UMLClass::isSubclassOf',
-  'UMLClass::getStaticProperties',
-  'UMLClass::getDefaultProperties',
-  'UMLClass::isIterateable',
-  'UMLClass::implementsInterface',
-  'UMLClass::getExtension',
-  'UMLClass::getExtensionName');
-
-$miss = array();
-
-$res = $r-getMethodNames();
-
-foreach($exp as $m)
-{
-   if (!in_array($m, $exp))
-   {
-   $miss[] = $m;
-   }
-}
-
-var_dump($miss);
-
-$props = array_keys(get_class_vars('ReflectionClassEx'));
-sort($props);
-var_dump($props);
-var_dump($r-name);
-?
-===DONE===
---EXPECT--
-array(0) {
-}
-array(2) {
-  [0]=
-  string(3) bla
-  [1]=
-  string(4) name
-}
-string(17) ReflectionClassEx
-===DONE===
---UEXPECT--
-array(0) {
-}
-array(2) {
-  [0]=
-  unicode(3) bla
-  [1]=
-  unicode(4) name
-}
-unicode(17) ReflectionClassEx
-===DONE===
+--TEST--
+Reflection inheritance
+--SKIPIF--
+?php extension_loaded('reflection') or die('skip'); ?
+--FILE--
+?php
+
+class ReflectionClassEx extends ReflectionClass
+{
+   public $bla;
+
+   function getMethodNames()
+   {
+   $res = array();
+   foreach($this-getMethods() as $m)
+   {
+   $res[] = $m-class . '::' . $m-name;
+   }
+   return $res;
+   }
+}
+
+$r = new ReflectionClassEx('ReflectionClassEx');
+
+$exp = array (
+  'UMLClass::__clone',
+  'UMLClass::export',
+  'UMLClass::__construct',
+  'UMLClass::__toString',
+  'UMLClass::getName',
+  'UMLClass::isInternal',
+  'UMLClass::isUserDefined',
+  'UMLClass::isInstantiable',
+  'UMLClass::getFileName',
+  'UMLClass::getStartLine',
+  'UMLClass::getEndLine',
+  'UMLClass::getDocComment',
+  'UMLClass::getConstructor',
+  'UMLClass::getMethod',
+  'UMLClass::getMethods',
+  'UMLClass::getProperty',
+  'UMLClass::getProperties',
+  'UMLClass::getConstants',
+  'UMLClass::getConstant',
+  'UMLClass::getInterfaces',
+  'UMLClass::isInterface',
+  'UMLClass::isAbstract',
+  'UMLClass::isFinal',
+  'UMLClass::getModifiers',
+  'UMLClass::isInstance',
+  'UMLClass::newInstance',
+  'UMLClass::getParentClass',
+  'UMLClass::isSubclassOf',
+  'UMLClass::getStaticProperties',
+  'UMLClass::getDefaultProperties',
+  'UMLClass::isIterateable',
+  'UMLClass::implementsInterface',
+  'UMLClass::getExtension',
+  'UMLClass::getExtensionName');
+
+$miss = array();
+
+$res = $r-getMethodNames();
+
+foreach($exp as $m)
+{
+   if (!in_array($m, $exp))
+   {
+   $miss[] = $m;
+   }
+}
+
+var_dump($miss);
+
+$props = 

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection/tests 001.phpt 002.phpt 004.phpt bug26695.phpt bug29268.phpt bug29523.phpt bug29828.phpt bug30146.phpt bug30148.phpt bug30856.phpt bug30961.phpt bug3331

2008-05-10 Thread Sebastian Bergmann
sebastian   Sun May 11 04:53:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/reflection/tests   001.phpt 002.phpt 004.phpt 
bug26695.phpt bug29268.phpt 
bug29523.phpt bug29828.phpt 
bug30146.phpt bug30148.phpt 
bug30856.phpt bug30961.phpt 
bug33312.phpt bug37964.phpt 
bug38942.phpt parameters_001.phpt 
reflectionClass_FileInfo_error.phpt 
reflectionClass_constructor_001.phpt 
reflectionClass_constructor_002.phpt 
reflectionClass_getConstant_basic.phpt 
reflectionClass_getConstant_error.phpt 

reflectionClass_getConstructor_basic.phpt 

reflectionClass_getConstructor_error.phpt 
  Log:
  MFH: dos2unix *.phpt
  http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/001.phpt?r1=1.1.4.1r2=1.1.4.1.4.1diff_format=u
Index: php-src/ext/reflection/tests/001.phpt
diff -u php-src/ext/reflection/tests/001.phpt:1.1.4.1 
php-src/ext/reflection/tests/001.phpt:1.1.4.1.4.1
--- php-src/ext/reflection/tests/001.phpt:1.1.4.1   Sun Mar 12 12:38:25 2006
+++ php-src/ext/reflection/tests/001.phpt   Sun May 11 04:53:18 2008
@@ -1,91 +1,91 @@
---TEST--
-Reflection inheritance
---SKIPIF--
-?php extension_loaded('reflection') or die('skip'); ?
---FILE--
-?php
-
-class ReflectionClassEx extends ReflectionClass
-{
-   public $bla;
-
-   function getMethodNames()
-   {
-   $res = array();
-   foreach($this-getMethods() as $m)
-   {
-   $res[] = $m-class . '::' . $m-name;
-   }
-   return $res;
-   }
-}
-
-$r = new ReflectionClassEx('ReflectionClassEx');
-
-$exp = array (
-  'UMLClass::__clone',
-  'UMLClass::export',
-  'UMLClass::__construct',
-  'UMLClass::__toString',
-  'UMLClass::getName',
-  'UMLClass::isInternal',
-  'UMLClass::isUserDefined',
-  'UMLClass::isInstantiable',
-  'UMLClass::getFileName',
-  'UMLClass::getStartLine',
-  'UMLClass::getEndLine',
-  'UMLClass::getDocComment',
-  'UMLClass::getConstructor',
-  'UMLClass::getMethod',
-  'UMLClass::getMethods',
-  'UMLClass::getProperty',
-  'UMLClass::getProperties',
-  'UMLClass::getConstants',
-  'UMLClass::getConstant',
-  'UMLClass::getInterfaces',
-  'UMLClass::isInterface',
-  'UMLClass::isAbstract',
-  'UMLClass::isFinal',
-  'UMLClass::getModifiers',
-  'UMLClass::isInstance',
-  'UMLClass::newInstance',
-  'UMLClass::getParentClass',
-  'UMLClass::isSubclassOf',
-  'UMLClass::getStaticProperties',
-  'UMLClass::getDefaultProperties',
-  'UMLClass::isIterateable',
-  'UMLClass::implementsInterface',
-  'UMLClass::getExtension',
-  'UMLClass::getExtensionName');
-
-$miss = array();
-
-$res = $r-getMethodNames();
-
-foreach($exp as $m)
-{
-   if (!in_array($m, $exp))
-   {
-   $miss[] = $m;
-   }
-}
-
-var_dump($miss);
-
-$props = array_keys(get_class_vars('ReflectionClassEx'));
-sort($props);
-var_dump($props);
-var_dump($r-name);
-?
-===DONE===
---EXPECT--
-array(0) {
-}
-array(2) {
-  [0]=
-  string(3) bla
-  [1]=
-  string(4) name
-}
-string(17) ReflectionClassEx
-===DONE===
+--TEST--
+Reflection inheritance
+--SKIPIF--
+?php extension_loaded('reflection') or die('skip'); ?
+--FILE--
+?php
+
+class ReflectionClassEx extends ReflectionClass
+{
+   public $bla;
+
+   function getMethodNames()
+   {
+   $res = array();
+   foreach($this-getMethods() as $m)
+   {
+   $res[] = $m-class . '::' . $m-name;
+   }
+   return $res;
+   }
+}
+
+$r = new ReflectionClassEx('ReflectionClassEx');
+
+$exp = array (
+  'UMLClass::__clone',
+  'UMLClass::export',
+  'UMLClass::__construct',
+  'UMLClass::__toString',
+  'UMLClass::getName',
+  'UMLClass::isInternal',
+  'UMLClass::isUserDefined',
+  'UMLClass::isInstantiable',
+  'UMLClass::getFileName',
+  'UMLClass::getStartLine',
+  'UMLClass::getEndLine',
+  'UMLClass::getDocComment',
+  'UMLClass::getConstructor',
+  'UMLClass::getMethod',
+  'UMLClass::getMethods',
+  'UMLClass::getProperty',
+  'UMLClass::getProperties',
+  'UMLClass::getConstants',
+  'UMLClass::getConstant',
+  'UMLClass::getInterfaces',
+  'UMLClass::isInterface',
+  'UMLClass::isAbstract',
+  'UMLClass::isFinal',
+  'UMLClass::getModifiers',
+  'UMLClass::isInstance',
+  'UMLClass::newInstance',
+  'UMLClass::getParentClass',
+  'UMLClass::isSubclassOf',
+  'UMLClass::getStaticProperties',
+  'UMLClass::getDefaultProperties',
+  'UMLClass::isIterateable',
+  

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection/tests 001.phpt 002.phpt 004.phpt bug26695.phpt bug29268.phpt bug29523.phpt bug29828.phpt bug30146.phpt bug30148.phpt bug30856.phpt bug30961.phpt bug3331

2008-05-10 Thread Sebastian Bergmann
sebastian   Sun May 11 04:53:26 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/reflection/tests   001.phpt 002.phpt 004.phpt 
bug26695.phpt bug29268.phpt 
bug29523.phpt bug29828.phpt 
bug30146.phpt bug30148.phpt 
bug30856.phpt bug30961.phpt 
bug33312.phpt bug38942.phpt 
parameters_001.phpt 
reflectionClass_FileInfo_error.phpt 
reflectionClass_constructor_001.phpt 
reflectionClass_constructor_002.phpt 
reflectionClass_getConstant_basic.phpt 
reflectionClass_getConstant_error.phpt 

reflectionClass_getConstructor_basic.phpt 

reflectionClass_getConstructor_error.phpt 
  Log:
  MFH: dos2unix *.phpt
  http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/001.phpt?r1=1.1.4.1r2=1.1.4.1.2.1diff_format=u
Index: php-src/ext/reflection/tests/001.phpt
diff -u php-src/ext/reflection/tests/001.phpt:1.1.4.1 
php-src/ext/reflection/tests/001.phpt:1.1.4.1.2.1
--- php-src/ext/reflection/tests/001.phpt:1.1.4.1   Sun Mar 12 12:38:25 2006
+++ php-src/ext/reflection/tests/001.phpt   Sun May 11 04:53:25 2008
@@ -1,91 +1,91 @@
---TEST--
-Reflection inheritance
---SKIPIF--
-?php extension_loaded('reflection') or die('skip'); ?
---FILE--
-?php
-
-class ReflectionClassEx extends ReflectionClass
-{
-   public $bla;
-
-   function getMethodNames()
-   {
-   $res = array();
-   foreach($this-getMethods() as $m)
-   {
-   $res[] = $m-class . '::' . $m-name;
-   }
-   return $res;
-   }
-}
-
-$r = new ReflectionClassEx('ReflectionClassEx');
-
-$exp = array (
-  'UMLClass::__clone',
-  'UMLClass::export',
-  'UMLClass::__construct',
-  'UMLClass::__toString',
-  'UMLClass::getName',
-  'UMLClass::isInternal',
-  'UMLClass::isUserDefined',
-  'UMLClass::isInstantiable',
-  'UMLClass::getFileName',
-  'UMLClass::getStartLine',
-  'UMLClass::getEndLine',
-  'UMLClass::getDocComment',
-  'UMLClass::getConstructor',
-  'UMLClass::getMethod',
-  'UMLClass::getMethods',
-  'UMLClass::getProperty',
-  'UMLClass::getProperties',
-  'UMLClass::getConstants',
-  'UMLClass::getConstant',
-  'UMLClass::getInterfaces',
-  'UMLClass::isInterface',
-  'UMLClass::isAbstract',
-  'UMLClass::isFinal',
-  'UMLClass::getModifiers',
-  'UMLClass::isInstance',
-  'UMLClass::newInstance',
-  'UMLClass::getParentClass',
-  'UMLClass::isSubclassOf',
-  'UMLClass::getStaticProperties',
-  'UMLClass::getDefaultProperties',
-  'UMLClass::isIterateable',
-  'UMLClass::implementsInterface',
-  'UMLClass::getExtension',
-  'UMLClass::getExtensionName');
-
-$miss = array();
-
-$res = $r-getMethodNames();
-
-foreach($exp as $m)
-{
-   if (!in_array($m, $exp))
-   {
-   $miss[] = $m;
-   }
-}
-
-var_dump($miss);
-
-$props = array_keys(get_class_vars('ReflectionClassEx'));
-sort($props);
-var_dump($props);
-var_dump($r-name);
-?
-===DONE===
---EXPECT--
-array(0) {
-}
-array(2) {
-  [0]=
-  string(3) bla
-  [1]=
-  string(4) name
-}
-string(17) ReflectionClassEx
-===DONE===
+--TEST--
+Reflection inheritance
+--SKIPIF--
+?php extension_loaded('reflection') or die('skip'); ?
+--FILE--
+?php
+
+class ReflectionClassEx extends ReflectionClass
+{
+   public $bla;
+
+   function getMethodNames()
+   {
+   $res = array();
+   foreach($this-getMethods() as $m)
+   {
+   $res[] = $m-class . '::' . $m-name;
+   }
+   return $res;
+   }
+}
+
+$r = new ReflectionClassEx('ReflectionClassEx');
+
+$exp = array (
+  'UMLClass::__clone',
+  'UMLClass::export',
+  'UMLClass::__construct',
+  'UMLClass::__toString',
+  'UMLClass::getName',
+  'UMLClass::isInternal',
+  'UMLClass::isUserDefined',
+  'UMLClass::isInstantiable',
+  'UMLClass::getFileName',
+  'UMLClass::getStartLine',
+  'UMLClass::getEndLine',
+  'UMLClass::getDocComment',
+  'UMLClass::getConstructor',
+  'UMLClass::getMethod',
+  'UMLClass::getMethods',
+  'UMLClass::getProperty',
+  'UMLClass::getProperties',
+  'UMLClass::getConstants',
+  'UMLClass::getConstant',
+  'UMLClass::getInterfaces',
+  'UMLClass::isInterface',
+  'UMLClass::isAbstract',
+  'UMLClass::isFinal',
+  'UMLClass::getModifiers',
+  'UMLClass::isInstance',
+  'UMLClass::newInstance',
+  'UMLClass::getParentClass',
+  'UMLClass::isSubclassOf',
+  'UMLClass::getStaticProperties',
+  'UMLClass::getDefaultProperties',
+  'UMLClass::isIterateable',
+  

[PHP-CVS] cvs: php-src /ext/reflection/tests ReflectionFunction_getExtension.phpt ReflectionFunction_getExtensionName.phpt

2008-05-10 Thread Sebastian Bergmann
sebastian   Sun May 11 04:56:12 2008 UTC

  Added files: 
/php-src/ext/reflection/tests   

ReflectionFunction_getExtensionName.phpt 
ReflectionFunction_getExtension.phpt 
  Log:
  Add tests for ReflectionFunction::getExtension*().
  

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
+++ php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
--TEST--
ReflectionFunction::getExtensionName()
--FILE--
?php
function foo() {}

$function = new ReflectionFunction('sort');
var_dump($function-getExtensionName());

$function = new ReflectionFunction('foo');
var_dump($function-getExtensionName());
?
--EXPECT--
string(8) standard
bool(false)


http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt
+++ php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt
--TEST--
ReflectionFunction::getExtension()
--FILE--
?php
function foo () {}

$function = new ReflectionFunction('sort');
var_dump($function-getExtension());

$function = new ReflectionFunction('foo');
var_dump($function-getExtension());
?
--EXPECTF--
object(ReflectionExtension)#%i (1) {
  [name]=
  string(8) standard
}
NULL




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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection/tests ReflectionFunction_getExtension.phpt ReflectionFunction_getExtensionName.phpt

2008-05-10 Thread Sebastian Bergmann
sebastian   Sun May 11 04:57:09 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/reflection/tests   

ReflectionFunction_getExtensionName.phpt 
ReflectionFunction_getExtension.phpt 
  Log:
  MFH: Add tests for ReflectionFunction::getExtension*().
  

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
+++ php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
--TEST--
ReflectionFunction::getExtensionName()
--FILE--
?php
function foo() {}

$function = new ReflectionFunction('sort');
var_dump($function-getExtensionName());

$function = new ReflectionFunction('foo');
var_dump($function-getExtensionName());
?
--EXPECT--
string(8) standard
bool(false)


http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt
+++ php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt
--TEST--
ReflectionFunction::getExtension()
--FILE--
?php
function foo () {}

$function = new ReflectionFunction('sort');
var_dump($function-getExtension());

$function = new ReflectionFunction('foo');
var_dump($function-getExtension());
?
--EXPECTF--
object(ReflectionExtension)#%i (1) {
  [name]=
  string(8) standard
}
NULL




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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection/tests ReflectionFunction_getExtension.phpt ReflectionFunction_getExtensionName.phpt

2008-05-10 Thread Sebastian Bergmann
sebastian   Sun May 11 04:57:27 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests   

ReflectionFunction_getExtensionName.phpt 
ReflectionFunction_getExtension.phpt 
  Log:
  MFH: Add tests for ReflectionFunction::getExtension*().
  

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
+++ php-src/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
--TEST--
ReflectionFunction::getExtensionName()
--FILE--
?php
function foo() {}

$function = new ReflectionFunction('sort');
var_dump($function-getExtensionName());

$function = new ReflectionFunction('foo');
var_dump($function-getExtensionName());
?
--EXPECT--
string(8) standard
bool(false)


http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt
+++ php-src/ext/reflection/tests/ReflectionFunction_getExtension.phpt
--TEST--
ReflectionFunction::getExtension()
--FILE--
?php
function foo () {}

$function = new ReflectionFunction('sort');
var_dump($function-getExtension());

$function = new ReflectionFunction('foo');
var_dump($function-getExtension());
?
--EXPECTF--
object(ReflectionExtension)#%i (1) {
  [name]=
  string(8) standard
}
NULL




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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c

2008-02-04 Thread Sebastian Bergmann
sebastian   Mon Feb  4 15:23:11 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/domattr.c cdatasection.c characterdata.c comment.c 
document.c documentfragment.c domconfiguration.c 
domerrorhandler.c domimplementation.c 
domimplementationlist.c domimplementationsource.c 
domstringlist.c element.c entityreference.c 
namednodemap.c namelist.c nodelist.c 
processinginstruction.c string_extend.c text.c 
  Log:
  MFH: Add missing Reflection API metadata for DOM classes.
  http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2.2.3r2=1.18.2.2.2.4diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.18.2.2.2.3 php-src/ext/dom/attr.c:1.18.2.2.2.4
--- php-src/ext/dom/attr.c:1.18.2.2.2.3 Mon Dec 31 07:20:05 2007
+++ php-src/ext/dom/attr.c  Mon Feb  4 15:23:10 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.18.2.2.2.3 2007/12/31 07:20:05 sebastian Exp $ */
+/* $Id: attr.c,v 1.18.2.2.2.4 2008/02/04 15:23:10 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -30,6 +30,18 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_construct, 0, 0, 1)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMAttr extends DOMNode 
 *
@@ -38,8 +50,8 @@
 */
 
 zend_function_entry php_dom_attr_class_functions[] = {
-   PHP_FALIAS(isId, dom_attr_is_id, NULL)
-   PHP_ME(domattr, __construct, NULL, ZEND_ACC_PUBLIC)
+   PHP_FALIAS(isId, dom_attr_is_id, arginfo_dom_attr_is_id)
+   PHP_ME(domattr, __construct, arginfo_dom_attr_construct, 
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.2r2=1.11.2.1.2.3diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.2 
php-src/ext/dom/cdatasection.c:1.11.2.1.2.3
--- php-src/ext/dom/cdatasection.c:1.11.2.1.2.2 Mon Dec 31 07:20:05 2007
+++ php-src/ext/dom/cdatasection.c  Mon Feb  4 15:23:10 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: cdatasection.c,v 1.11.2.1.2.2 2007/12/31 07:20:05 sebastian Exp $ */
+/* $Id: cdatasection.c,v 1.11.2.1.2.3 2008/02/04 15:23:10 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -28,6 +28,13 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_cdatasection_construct, 0, 0, 1)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMCdataSection extends DOMText 
 *
@@ -36,7 +43,7 @@
 */
 
 zend_function_entry php_dom_cdatasection_class_functions[] = {
-   PHP_ME(domcdatasection, __construct, NULL, ZEND_ACC_PUBLIC)
+   PHP_ME(domcdatasection, __construct, 
arginfo_dom_cdatasection_construct, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/characterdata.c?r1=1.15.2.1.2.3r2=1.15.2.1.2.4diff_format=u
Index: php-src/ext/dom/characterdata.c
diff -u php-src/ext/dom/characterdata.c:1.15.2.1.2.3 
php-src/ext/dom/characterdata.c:1.15.2.1.2.4
--- php-src/ext/dom/characterdata.c:1.15.2.1.2.3Mon Dec 31 07:20:05 2007
+++ php-src/ext/dom/characterdata.c Mon Feb  4 15:23:10 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: characterdata.c,v 1.15.2.1.2.3 2007/12/31 07:20:05 sebastian Exp $ */
+/* $Id: characterdata.c,v 1.15.2.1.2.4 2008/02/04 15:23:10 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -28,6 +28,38 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_substring_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_append_data, 0, 0, 1)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_insert_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_delete_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_replace_data, 0, 0, 3)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMCharacterData extends DOMNode 
 *
@@ -36,11 +68,11 @@
 */
 
 zend_function_entry php_dom_characterdata_class_functions[] = {
-   

[PHP-CVS] cvs: php-src /ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c domimplem

2008-02-04 Thread Sebastian Bergmann
sebastian   Mon Feb  4 15:22:40 2008 UTC

  Modified files:  
/php-src/ext/domattr.c cdatasection.c characterdata.c comment.c 
document.c documentfragment.c domconfiguration.c 
domerrorhandler.c domimplementation.c 
domimplementationlist.c domimplementationsource.c 
domstringlist.c element.c entityreference.c 
namednodemap.c namelist.c nodelist.c 
processinginstruction.c string_extend.c text.c 
  Log:
  Add missing Reflection API metadata for DOM classes.
  http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.29 php-src/ext/dom/attr.c:1.30
--- php-src/ext/dom/attr.c:1.29 Mon Dec 31 07:12:08 2007
+++ php-src/ext/dom/attr.c  Mon Feb  4 15:22:40 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.29 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: attr.c,v 1.30 2008/02/04 15:22:40 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -30,6 +30,18 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_construct, 0, 0, 1)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMAttr extends DOMNode 
 *
@@ -38,8 +50,8 @@
 */
 
 const zend_function_entry php_dom_attr_class_functions[] = {
-   PHP_FALIAS(isId, dom_attr_is_id, NULL)
-   PHP_ME(domattr, __construct, NULL, ZEND_ACC_PUBLIC)
+   PHP_FALIAS(isId, dom_attr_is_id, arginfo_dom_attr_is_id)
+   PHP_ME(domattr, __construct, arginfo_dom_attr_construct, 
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.19 php-src/ext/dom/cdatasection.c:1.20
--- php-src/ext/dom/cdatasection.c:1.19 Mon Dec 31 07:12:08 2007
+++ php-src/ext/dom/cdatasection.c  Mon Feb  4 15:22:40 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: cdatasection.c,v 1.19 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: cdatasection.c,v 1.20 2008/02/04 15:22:40 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -28,6 +28,13 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_cdatasection_construct, 0, 0, 1)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMCdataSection extends DOMText 
 *
@@ -36,7 +43,7 @@
 */
 
 const zend_function_entry php_dom_cdatasection_class_functions[] = {
-   PHP_ME(domcdatasection, __construct, NULL, ZEND_ACC_PUBLIC)
+   PHP_ME(domcdatasection, __construct, 
arginfo_dom_cdatasection_construct, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/characterdata.c?r1=1.25r2=1.26diff_format=u
Index: php-src/ext/dom/characterdata.c
diff -u php-src/ext/dom/characterdata.c:1.25 
php-src/ext/dom/characterdata.c:1.26
--- php-src/ext/dom/characterdata.c:1.25Mon Dec 31 07:12:08 2007
+++ php-src/ext/dom/characterdata.c Mon Feb  4 15:22:40 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: characterdata.c,v 1.25 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: characterdata.c,v 1.26 2008/02/04 15:22:40 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -28,6 +28,38 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_substring_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_append_data, 0, 0, 1)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_insert_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_delete_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_replace_data, 0, 0, 3)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMCharacterData extends DOMNode 
 *
@@ -36,11 +68,11 @@
 */
 
 const zend_function_entry php_dom_characterdata_class_functions[] = {
-   PHP_FALIAS(substringData, dom_characterdata_substring_data, NULL)
-   PHP_FALIAS(appendData, dom_characterdata_append_data, NULL)
-   PHP_FALIAS(insertData, 

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c

2008-02-04 Thread Sebastian Bergmann
sebastian   Mon Feb  4 15:22:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/domattr.c cdatasection.c characterdata.c comment.c 
document.c documentfragment.c domconfiguration.c 
domerrorhandler.c domimplementation.c 
domimplementationlist.c domimplementationsource.c 
domstringlist.c element.c entityreference.c 
namednodemap.c namelist.c nodelist.c 
processinginstruction.c string_extend.c text.c 
  Log:
  MFH: Add missing Reflection API metadata for DOM classes.
  http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2.2.2.2.3r2=1.18.2.2.2.2.2.4diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.18.2.2.2.2.2.3 
php-src/ext/dom/attr.c:1.18.2.2.2.2.2.4
--- php-src/ext/dom/attr.c:1.18.2.2.2.2.2.3 Mon Dec 31 07:17:07 2007
+++ php-src/ext/dom/attr.c  Mon Feb  4 15:22:59 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.18.2.2.2.2.2.3 2007/12/31 07:17:07 sebastian Exp $ */
+/* $Id: attr.c,v 1.18.2.2.2.2.2.4 2008/02/04 15:22:59 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -30,6 +30,18 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_construct, 0, 0, 1)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMAttr extends DOMNode 
 *
@@ -38,8 +50,8 @@
 */
 
 const zend_function_entry php_dom_attr_class_functions[] = {
-   PHP_FALIAS(isId, dom_attr_is_id, NULL)
-   PHP_ME(domattr, __construct, NULL, ZEND_ACC_PUBLIC)
+   PHP_FALIAS(isId, dom_attr_is_id, arginfo_dom_attr_is_id)
+   PHP_ME(domattr, __construct, arginfo_dom_attr_construct, 
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.1.2.2r2=1.11.2.1.2.1.2.3diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.2 
php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.3
--- php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007
+++ php-src/ext/dom/cdatasection.c  Mon Feb  4 15:22:59 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ 
*/
+/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -28,6 +28,13 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_cdatasection_construct, 0, 0, 1)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMCdataSection extends DOMText 
 *
@@ -36,7 +43,7 @@
 */
 
 const zend_function_entry php_dom_cdatasection_class_functions[] = {
-   PHP_ME(domcdatasection, __construct, NULL, ZEND_ACC_PUBLIC)
+   PHP_ME(domcdatasection, __construct, 
arginfo_dom_cdatasection_construct, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/characterdata.c?r1=1.15.2.1.2.2.2.3r2=1.15.2.1.2.2.2.4diff_format=u
Index: php-src/ext/dom/characterdata.c
diff -u php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.3 
php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.4
--- php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.3Mon Dec 31 07:17:07 2007
+++ php-src/ext/dom/characterdata.c Mon Feb  4 15:22:59 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: characterdata.c,v 1.15.2.1.2.2.2.3 2007/12/31 07:17:07 sebastian Exp $ 
*/
+/* $Id: characterdata.c,v 1.15.2.1.2.2.2.4 2008/02/04 15:22:59 sebastian Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -28,6 +28,38 @@
 #include php_dom.h
 
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_substring_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_append_data, 0, 0, 1)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_insert_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_delete_data, 0, 0, 2)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_replace_data, 0, 0, 3)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, count)
+   ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMCharacterData extends DOMNode 
 *
@@ -36,11 

[PHP-CVS] cvs: php-src /ext/dom xpath.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 15:55:14 2008 UTC

  Modified files:  
/php-src/ext/domxpath.c 
  Log:
  Add Reflection API metadata for DOMXPath.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.36 php-src/ext/dom/xpath.c:1.37
--- php-src/ext/dom/xpath.c:1.36Mon Dec 31 07:12:09 2007
+++ php-src/ext/dom/xpath.c Tue Jan 29 15:55:14 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xpath.c,v 1.36 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: xpath.c,v 1.37 2008/01/29 15:55:14 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -36,12 +36,41 @@
 
 #if defined(LIBXML_XPATH_ENABLED)
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
+   ZEND_ARG_INFO(0, prefix)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_php_functions, 0, 0, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 const zend_function_entry php_dom_xpath_class_functions[] = {
-   PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC)
-   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL)
-   PHP_FALIAS(query, dom_xpath_query, NULL)
-   PHP_FALIAS(evaluate, dom_xpath_evaluate, NULL)
-   PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions, NULL)
+   PHP_ME(domxpath, __construct, arginfo_dom_xpath_construct, 
ZEND_ACC_PUBLIC)
+   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, 
arginfo_dom_xpath_register_ns)
+   PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query)
+   PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate)
+   PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions, 
arginfo_dom_xpath_register_php_functions)
{NULL, NULL, NULL}
 };
 

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom xpath.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 15:55:23 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/domxpath.c 
  Log:
  MFH: Add Reflection API metadata for DOMXPath.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.1.2.3r2=1.26.2.1.2.1.2.4diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.3 
php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.4
--- php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.3Fri Jan 25 16:13:04 2008
+++ php-src/ext/dom/xpath.c Tue Jan 29 15:55:23 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xpath.c,v 1.26.2.1.2.1.2.3 2008/01/25 16:13:04 rrichards Exp $ */
+/* $Id: xpath.c,v 1.26.2.1.2.1.2.4 2008/01/29 15:55:23 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -36,12 +36,41 @@
 
 #if defined(LIBXML_XPATH_ENABLED)
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
+   ZEND_ARG_INFO(0, prefix)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_php_functions, 0, 0, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 const zend_function_entry php_dom_xpath_class_functions[] = {
-   PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC)
-   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL)
-   PHP_FALIAS(query, dom_xpath_query, NULL)
-   PHP_FALIAS(evaluate, dom_xpath_evaluate, NULL)
-   PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions, NULL)
+   PHP_ME(domxpath, __construct, arginfo_dom_xpath_construct, 
ZEND_ACC_PUBLIC)
+   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, 
arginfo_dom_xpath_register_ns)
+   PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query)
+   PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate)
+   PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions, 
arginfo_dom_xpath_register_php_functions)
{NULL, NULL, NULL}
 };
 

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom xpath.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 15:55:30 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/domxpath.c 
  Log:
  MFH: Add Reflection API metadata for DOMXPath.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.2r2=1.26.2.1.2.3diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.2 
php-src/ext/dom/xpath.c:1.26.2.1.2.3
--- php-src/ext/dom/xpath.c:1.26.2.1.2.2Mon Dec 31 07:20:06 2007
+++ php-src/ext/dom/xpath.c Tue Jan 29 15:55:29 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xpath.c,v 1.26.2.1.2.2 2007/12/31 07:20:06 sebastian Exp $ */
+/* $Id: xpath.c,v 1.26.2.1.2.3 2008/01/29 15:55:29 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -36,11 +36,36 @@
 
 #if defined(LIBXML_XPATH_ENABLED)
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
+   ZEND_ARG_INFO(0, prefix)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 zend_function_entry php_dom_xpath_class_functions[] = {
-   PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC)
-   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL)
-   PHP_FALIAS(query, dom_xpath_query, NULL)
-   PHP_FALIAS(evaluate, dom_xpath_evaluate, NULL)
+   PHP_ME(domxpath, __construct, arginfo_dom_xpath_construct, 
ZEND_ACC_PUBLIC)
+   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, 
arginfo_dom_xpath_register_ns)
+   PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query)
+   PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate)
{NULL, NULL, NULL}
 };
 

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom node.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 15:23:25 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/domnode.c 
  Log:
  MFH: Add Reflection API metadata for DOMNode.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.9r2=1.37.2.3.2.10diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.9 php-src/ext/dom/node.c:1.37.2.3.2.10
--- php-src/ext/dom/node.c:1.37.2.3.2.9 Mon Dec 31 07:20:06 2007
+++ php-src/ext/dom/node.c  Tue Jan 29 15:23:25 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.37.2.3.2.9 2007/12/31 07:20:06 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.10 2008/01/29 15:23:25 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,122 @@
 #if HAVE_LIBXML  HAVE_DOM
 #include php_dom.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1)
+   ZEND_ARG_INFO(0, deep)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2)
+   ZEND_ARG_INFO(0, feature)
+   ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1)
+   ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1)
+   ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
+   ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
+   ZEND_ARG_INFO(0, feature)
+   ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
+   ZEND_ARG_INFO(0, key)
+   ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+   ZEND_ARG_INFO(0, handler)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
+   ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
+   ZEND_ARG_INFO(0, exclusive)
+   ZEND_ARG_INFO(0, with_comments)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1)
+   ZEND_ARG_INFO(0, uri)
+   ZEND_ARG_INFO(0, exclusive)
+   ZEND_ARG_INFO(0, with_comments)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMNode 
 *
@@ -35,27 +151,27 @@
 */
 
 zend_function_entry php_dom_node_class_functions[] = {
-   PHP_FALIAS(insertBefore, dom_node_insert_before, NULL)
-   PHP_FALIAS(replaceChild, dom_node_replace_child, NULL)
-   PHP_FALIAS(removeChild, dom_node_remove_child, NULL)
-   PHP_FALIAS(appendChild, dom_node_append_child, NULL)
-   PHP_FALIAS(hasChildNodes, dom_node_has_child_nodes, NULL)
-   PHP_FALIAS(cloneNode, dom_node_clone_node, NULL)
-   PHP_FALIAS(normalize, dom_node_normalize, NULL)
-   PHP_FALIAS(isSupported, dom_node_is_supported, NULL)
-   PHP_FALIAS(hasAttributes, dom_node_has_attributes, NULL)
-   PHP_FALIAS(compareDocumentPosition, dom_node_compare_document_position, 
NULL)
-   PHP_FALIAS(isSameNode, dom_node_is_same_node, NULL)
-   

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom node.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 15:23:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/domnode.c 
  Log:
  MFH: Add Reflection API metadata for DOMNode.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.3r2=1.37.2.3.2.8.2.4diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.3 
php-src/ext/dom/node.c:1.37.2.3.2.8.2.4
--- php-src/ext/dom/node.c:1.37.2.3.2.8.2.3 Mon Dec 31 07:17:07 2007
+++ php-src/ext/dom/node.c  Tue Jan 29 15:23:18 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.37.2.3.2.8.2.3 2007/12/31 07:17:07 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.8.2.4 2008/01/29 15:23:18 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,122 @@
 #if HAVE_LIBXML  HAVE_DOM
 #include php_dom.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1)
+   ZEND_ARG_INFO(0, deep)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2)
+   ZEND_ARG_INFO(0, feature)
+   ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1)
+   ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1)
+   ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
+   ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
+   ZEND_ARG_INFO(0, feature)
+   ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
+   ZEND_ARG_INFO(0, key)
+   ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+   ZEND_ARG_INFO(0, handler)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
+   ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
+   ZEND_ARG_INFO(0, exclusive)
+   ZEND_ARG_INFO(0, with_comments)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1)
+   ZEND_ARG_INFO(0, uri)
+   ZEND_ARG_INFO(0, exclusive)
+   ZEND_ARG_INFO(0, with_comments)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMNode 
 *
@@ -35,27 +151,27 @@
 */
 
 const zend_function_entry php_dom_node_class_functions[] = {
-   PHP_FALIAS(insertBefore, dom_node_insert_before, NULL)
-   PHP_FALIAS(replaceChild, dom_node_replace_child, NULL)
-   PHP_FALIAS(removeChild, dom_node_remove_child, NULL)
-   PHP_FALIAS(appendChild, dom_node_append_child, NULL)
-   PHP_FALIAS(hasChildNodes, dom_node_has_child_nodes, NULL)
-   PHP_FALIAS(cloneNode, dom_node_clone_node, NULL)
-   PHP_FALIAS(normalize, dom_node_normalize, NULL)
-   PHP_FALIAS(isSupported, dom_node_is_supported, NULL)
-   PHP_FALIAS(hasAttributes, dom_node_has_attributes, NULL)
-   PHP_FALIAS(compareDocumentPosition, dom_node_compare_document_position, 
NULL)
-   PHP_FALIAS(isSameNode, 

[PHP-CVS] cvs: php-src /ext/dom node.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 15:23:08 2008 UTC

  Modified files:  
/php-src/ext/domnode.c 
  Log:
  Add Reflection API metadata for DOMNode.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.59r2=1.60diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.59 php-src/ext/dom/node.c:1.60
--- php-src/ext/dom/node.c:1.59 Mon Dec 31 07:12:09 2007
+++ php-src/ext/dom/node.c  Tue Jan 29 15:23:08 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.59 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: node.c,v 1.60 2008/01/29 15:23:08 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,122 @@
 #if HAVE_LIBXML  HAVE_DOM
 #include php_dom.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1)
+   ZEND_ARG_INFO(0, deep)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2)
+   ZEND_ARG_INFO(0, feature)
+   ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1)
+   ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1)
+   ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
+   ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
+   ZEND_ARG_INFO(0, feature)
+   ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
+   ZEND_ARG_INFO(0, key)
+   ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+   ZEND_ARG_INFO(0, handler)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
+   ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
+   ZEND_ARG_INFO(0, exclusive)
+   ZEND_ARG_INFO(0, with_comments)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1)
+   ZEND_ARG_INFO(0, uri)
+   ZEND_ARG_INFO(0, exclusive)
+   ZEND_ARG_INFO(0, with_comments)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class DOMNode 
 *
@@ -35,27 +151,27 @@
 */
 
 const zend_function_entry php_dom_node_class_functions[] = {
-   PHP_FALIAS(insertBefore, dom_node_insert_before, NULL)
-   PHP_FALIAS(replaceChild, dom_node_replace_child, NULL)
-   PHP_FALIAS(removeChild, dom_node_remove_child, NULL)
-   PHP_FALIAS(appendChild, dom_node_append_child, NULL)
-   PHP_FALIAS(hasChildNodes, dom_node_has_child_nodes, NULL)
-   PHP_FALIAS(cloneNode, dom_node_clone_node, NULL)
-   PHP_FALIAS(normalize, dom_node_normalize, NULL)
-   PHP_FALIAS(isSupported, dom_node_is_supported, NULL)
-   PHP_FALIAS(hasAttributes, dom_node_has_attributes, NULL)
-   PHP_FALIAS(compareDocumentPosition, dom_node_compare_document_position, 
NULL)
-   PHP_FALIAS(isSameNode, dom_node_is_same_node, NULL)
-   PHP_FALIAS(lookupPrefix, dom_node_lookup_prefix, NULL)
-   

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xsl xsltprocessor.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 21:21:28 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH: Fix arginfo and prototype.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.12r2=1.39.2.2.2.13diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.12 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.13
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.12   Tue Jan 29 07:51:46 2008
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 21:21:28 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.12 2008/01/29 07:51:46 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.13 2008/01/29 21:21:28 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -74,6 +74,7 @@
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+   ZEND_ARG_INFO(0, restrict)
 ZEND_END_ARG_INFO();
 /* }}} */
 
@@ -773,7 +774,7 @@
 }
 /* }}} end xsl_xsltprocessor_remove_parameter */
 
-/* {{{ proto void xsl_xsltprocessor_register_php_functions();
+/* {{{ proto void xsl_xsltprocessor_register_php_functions([mixed $restrict]);
 */
 PHP_FUNCTION(xsl_xsltprocessor_register_php_functions)
 {

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xsl xsltprocessor.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 21:21:20 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH: Fix arginfo and prototype.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.6r2=1.39.2.2.2.9.2.7diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.6 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.7
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.6Tue Jan 29 07:51:43 2008
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 21:21:20 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.6 2008/01/29 07:51:43 sebastian Exp $ 
*/
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.7 2008/01/29 21:21:20 sebastian Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -74,6 +74,7 @@
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+   ZEND_ARG_INFO(0, restrict)
 ZEND_END_ARG_INFO();
 
 static
@@ -796,7 +797,7 @@
 }
 /* }}} end xsl_xsltprocessor_remove_parameter */
 
-/* {{{ proto void xsl_xsltprocessor_register_php_functions();
+/* {{{ proto void xsl_xsltprocessor_register_php_functions([mixed $restrict]);
 */
 PHP_FUNCTION(xsl_xsltprocessor_register_php_functions)
 {

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



[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Tue Jan 29 21:21:04 2008 UTC

  Modified files:  
/php-src/ext/xslxsltprocessor.c 
  Log:
  - Fix arginfo and prototype.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.62r2=1.63diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.62 
php-src/ext/xsl/xsltprocessor.c:1.63
--- php-src/ext/xsl/xsltprocessor.c:1.62Tue Jan 29 07:51:40 2008
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 21:21:04 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.62 2008/01/29 07:51:40 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.63 2008/01/29 21:21:04 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -74,6 +74,7 @@
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+   ZEND_ARG_INFO(0, restrict)
 ZEND_END_ARG_INFO();
 
 static
@@ -831,7 +832,7 @@
 }
 /* }}} end xsl_xsltprocessor_remove_parameter */
 
-/* {{{ proto void xsl_xsltprocessor_register_php_functions() U
+/* {{{ proto void xsl_xsltprocessor_register_php_functions([mixed $restrict]); 
U
 */
 PHP_FUNCTION(xsl_xsltprocessor_register_php_functions)
 {

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom node.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Wed Jan 30 06:48:20 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/domnode.c 
  Log:
  MFH: Fix arginfo.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.10r2=1.37.2.3.2.11diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.10 
php-src/ext/dom/node.c:1.37.2.3.2.11
--- php-src/ext/dom/node.c:1.37.2.3.2.10Tue Jan 29 15:23:25 2008
+++ php-src/ext/dom/node.c  Wed Jan 30 06:48:20 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.37.2.3.2.10 2008/01/29 15:23:25 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.11 2008/01/30 06:48:20 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -29,9 +29,9 @@
 
 /* {{{ arginfo */
 static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
-   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1)
 ZEND_END_ARG_INFO();
 
 static
@@ -129,8 +129,8 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
-   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
-   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
 ZEND_END_ARG_INFO();
 
 static
@@ -138,8 +138,8 @@
ZEND_ARG_INFO(0, uri)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
-   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
-   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
 ZEND_END_ARG_INFO();
 /* }}} */
 

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom node.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Wed Jan 30 06:48:13 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/domnode.c 
  Log:
  MFH: Fix arginfo.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.4r2=1.37.2.3.2.8.2.5diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.4 
php-src/ext/dom/node.c:1.37.2.3.2.8.2.5
--- php-src/ext/dom/node.c:1.37.2.3.2.8.2.4 Tue Jan 29 15:23:18 2008
+++ php-src/ext/dom/node.c  Wed Jan 30 06:48:13 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.37.2.3.2.8.2.4 2008/01/29 15:23:18 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.8.2.5 2008/01/30 06:48:13 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -29,9 +29,9 @@
 
 /* {{{ arginfo */
 static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
-   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1)
 ZEND_END_ARG_INFO();
 
 static
@@ -129,8 +129,8 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
-   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
-   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
 ZEND_END_ARG_INFO();
 
 static
@@ -138,8 +138,8 @@
ZEND_ARG_INFO(0, uri)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
-   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
-   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
 ZEND_END_ARG_INFO();
 /* }}} */
 

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



[PHP-CVS] cvs: php-src /ext/dom node.c

2008-01-29 Thread Sebastian Bergmann
sebastian   Wed Jan 30 06:48:02 2008 UTC

  Modified files:  
/php-src/ext/domnode.c 
  Log:
  Fix arginfo.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.60r2=1.61diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.60 php-src/ext/dom/node.c:1.61
--- php-src/ext/dom/node.c:1.60 Tue Jan 29 15:23:08 2008
+++ php-src/ext/dom/node.c  Wed Jan 30 06:48:02 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.60 2008/01/29 15:23:08 sebastian Exp $ */
+/* $Id: node.c,v 1.61 2008/01/30 06:48:02 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -29,9 +29,9 @@
 
 /* {{{ arginfo */
 static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
-   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+   ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1)
 ZEND_END_ARG_INFO();
 
 static
@@ -129,8 +129,8 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
-   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
-   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
 ZEND_END_ARG_INFO();
 
 static
@@ -138,8 +138,8 @@
ZEND_ARG_INFO(0, uri)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
-   ZEND_ARG_ARRAY_INFO(0, xpath, 0)
-   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+   ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+   ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
 ZEND_END_ARG_INFO();
 /* }}} */
 

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



[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c

2008-01-28 Thread Sebastian Bergmann
sebastian   Tue Jan 29 07:51:40 2008 UTC

  Modified files:  
/php-src/ext/xslxsltprocessor.c 
  Log:
  Add Reflection API metadata for XSLTProcessor.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.61 
php-src/ext/xsl/xsltprocessor.c:1.62
--- php-src/ext/xsl/xsltprocessor.c:1.61Mon Dec 31 07:12:17 2007
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 07:51:40 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.61 2007/12/31 07:12:17 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.62 2008/01/29 07:51:40 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,61 @@
 #include php_xsl.h
 #include ext/libxml/php_libxml.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_profiling, 0, 0, 1)
+   ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class xsl_xsltprocessor 
 *
@@ -35,16 +90,16 @@
 */
 
 const zend_function_entry php_xsl_xsltprocessor_class_functions[] = {
-   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
-   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL)
-   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL)
-   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, NULL)
-   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, NULL)
-   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, NULL)
-   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, NULL)
-   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, NULL)
-   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, NULL)
-   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, NULL)
+   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, 
arginfo_xsl_xsltprocessor_import_stylesheet)
+   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, 
arginfo_xsl_xsltprocessor_transform_to_doc)
+   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, 
arginfo_xsl_xsltprocessor_transform_to_uri)
+   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, 
arginfo_xsl_xsltprocessor_transform_to_xml)
+   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, 
arginfo_xsl_xsltprocessor_set_parameter)
+   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, 
arginfo_xsl_xsltprocessor_get_parameter)
+   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, 
arginfo_xsl_xsltprocessor_remove_parameter)
+   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, 
arginfo_xsl_xsltprocessor_has_exslt_support)
+   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, 
arginfo_xsl_xsltprocessor_register_php_functions)
+   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, 
arginfo_xsl_xsltprocessor_set_profiling)
{NULL, NULL, NULL}
 };
 

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xsl xsltprocessor.c

2008-01-28 Thread Sebastian Bergmann
sebastian   Tue Jan 29 07:51:43 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH: Add Reflection API metadata for XSLTProcessor.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.5r2=1.39.2.2.2.9.2.6diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.5 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.6
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.5Mon Dec 31 07:17:16 2007
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 07:51:43 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.5 2007/12/31 07:17:16 sebastian Exp $ 
*/
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.6 2008/01/29 07:51:43 sebastian Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,61 @@
 #include php_xsl.h
 #include ext/libxml/php_libxml.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_profiling, 0, 0, 1)
+   ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class xsl_xsltprocessor 
 *
@@ -35,16 +90,16 @@
 */
 
 const zend_function_entry php_xsl_xsltprocessor_class_functions[] = {
-   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
-   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL)
-   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL)
-   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, NULL)
-   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, NULL)
-   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, NULL)
-   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, NULL)
-   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, NULL)
-   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, NULL)
-   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, NULL)
+   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, 
arginfo_xsl_xsltprocessor_import_stylesheet)
+   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, 
arginfo_xsl_xsltprocessor_transform_to_doc)
+   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, 
arginfo_xsl_xsltprocessor_transform_to_uri)
+   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, 
arginfo_xsl_xsltprocessor_transform_to_xml)
+   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, 
arginfo_xsl_xsltprocessor_set_parameter)
+   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, 
arginfo_xsl_xsltprocessor_get_parameter)
+   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, 
arginfo_xsl_xsltprocessor_remove_parameter)
+   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, 
arginfo_xsl_xsltprocessor_has_exslt_support)
+   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, 
arginfo_xsl_xsltprocessor_register_php_functions)
+   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, 
arginfo_xsl_xsltprocessor_set_profiling)
{NULL, NULL, NULL}
 };
 

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xsl xsltprocessor.c

2008-01-28 Thread Sebastian Bergmann
sebastian   Tue Jan 29 07:51:46 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH: Add Reflection API metadata for XSLTProcessor.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.11r2=1.39.2.2.2.12diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.11 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.12
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.11   Mon Dec 31 07:20:14 2007
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 07:51:46 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.11 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.12 2008/01/29 07:51:46 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,56 @@
 #include php_xsl.h
 #include ext/libxml/php_libxml.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class xsl_xsltprocessor 
 *
@@ -35,15 +85,15 @@
 */
 
 zend_function_entry php_xsl_xsltprocessor_class_functions[] = {
-   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
-   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL)
-   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL)
-   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, NULL)
-   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, NULL)
-   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, NULL)
-   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, NULL)
-   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, NULL)
-   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, NULL)
+   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, 
arginfo_xsl_xsltprocessor_import_stylesheet)
+   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, 
arginfo_xsl_xsltprocessor_transform_to_doc)
+   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, 
arginfo_xsl_xsltprocessor_transform_to_uri)
+   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, 
arginfo_xsl_xsltprocessor_transform_to_xml)
+   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, 
arginfo_xsl_xsltprocessor_set_parameter)
+   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, 
arginfo_xsl_xsltprocessor_get_parameter)
+   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, 
arginfo_xsl_xsltprocessor_remove_parameter)
+   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, 
arginfo_xsl_xsltprocessor_has_exslt_support)
+   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, 
arginfo_xsl_xsltprocessor_register_php_functions)
{NULL, NULL, NULL}
 };
 

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



[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php

2007-12-31 Thread Sebastian Bergmann
sebastian   Tue Jan  1 06:15:40 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcrun-tests.php 
  Log:
  Leftover: Bump copyright year.
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.9r2=1.226.2.37.2.35.2.10diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.9 
php-src/run-tests.php:1.226.2.37.2.35.2.10
--- php-src/run-tests.php:1.226.2.37.2.35.2.9   Tue Dec 25 12:06:34 2007
+++ php-src/run-tests.php   Tue Jan  1 06:15:40 2008
@@ -4,7 +4,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2007 The PHP Group|
+   | Copyright (c) 1997-2008 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.9 2007/12/25 12:06:34 dmitry Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.10 2008/01/01 06:15:40 sebastian Exp 
$ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.35.2.9 
$'.\n;
+   echo '$Revision: 1.226.2.37.2.35.2.10 
$'.\n;
exit(1);
 
case 'u':

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



[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php server-tests.php /sapi/cli php.1.in

2007-12-31 Thread Sebastian Bergmann
sebastian   Tue Jan  1 06:15:49 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcrun-tests.php server-tests.php 
/php-src/sapi/cli   php.1.in 
  Log:
  MFB: Leftover: Bump copyright year.
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.40r2=1.226.2.37.2.41diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.40 
php-src/run-tests.php:1.226.2.37.2.41
--- php-src/run-tests.php:1.226.2.37.2.40   Tue Dec 25 12:06:22 2007
+++ php-src/run-tests.php   Tue Jan  1 06:15:48 2008
@@ -4,7 +4,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2007 The PHP Group|
+   | Copyright (c) 1997-2008 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.40 2007/12/25 12:06:22 dmitry Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.41 2008/01/01 06:15:48 sebastian Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -403,7 +403,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.40 
$'.\n;
+   echo '$Revision: 1.226.2.37.2.41 
$'.\n;
exit(1);
 
case 'u':
http://cvs.php.net/viewvc.cgi/php-src/server-tests.php?r1=1.2.2.3.2.1r2=1.2.2.3.2.2diff_format=u
Index: php-src/server-tests.php
diff -u php-src/server-tests.php:1.2.2.3.2.1 
php-src/server-tests.php:1.2.2.3.2.2
--- php-src/server-tests.php:1.2.2.3.2.1Mon Jan  1 19:32:09 2007
+++ php-src/server-tests.phpTue Jan  1 06:15:48 2008
@@ -3,7 +3,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2007 The PHP Group|
+   | Copyright (c) 1997-2008 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.12.2.3.2.3r2=1.12.2.3.2.4diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.12.2.3.2.3 
php-src/sapi/cli/php.1.in:1.12.2.3.2.4
--- php-src/sapi/cli/php.1.in:1.12.2.3.2.3  Mon Apr 23 20:54:22 2007
+++ php-src/sapi/cli/php.1.in   Tue Jan  1 06:15:48 2008
@@ -1,4 +1,4 @@
-.TH PHP 1 2007 The PHP Group Scripting Language
+.TH PHP 1 2008 The PHP Group Scripting Language
 .SH NAME
 .TP 15
 php \- PHP Command Line Interface 'CLI'

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



[PHP-CVS] cvs: php-src / run-tests.php server-tests.php /sapi/cli php.1.in

2007-12-31 Thread Sebastian Bergmann
sebastian   Tue Jan  1 06:22:15 2008 UTC

  Modified files:  
/php-srcrun-tests.php server-tests.php 
/php-src/sapi/cli   php.1.in 
  Log:
  MFB: Leftover: Bump copyright year.
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.336r2=1.337diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.336 php-src/run-tests.php:1.337
--- php-src/run-tests.php:1.336 Tue Dec 25 12:06:53 2007
+++ php-src/run-tests.php   Tue Jan  1 06:22:15 2008
@@ -4,7 +4,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2007 The PHP Group|
+   | Copyright (c) 1997-2008 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.336 2007/12/25 12:06:53 dmitry Exp $ */
+/* $Id: run-tests.php,v 1.337 2008/01/01 06:22:15 sebastian Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -415,7 +415,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.336 $'.\n;
+   echo '$Revision: 1.337 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
http://cvs.php.net/viewvc.cgi/php-src/server-tests.php?r1=1.7r2=1.8diff_format=u
Index: php-src/server-tests.php
diff -u php-src/server-tests.php:1.7 php-src/server-tests.php:1.8
--- php-src/server-tests.php:1.7Mon May 28 23:00:25 2007
+++ php-src/server-tests.phpTue Jan  1 06:22:15 2008
@@ -3,7 +3,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2007 The PHP Group|
+   | Copyright (c) 1997-2008 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.20r2=1.21diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.20 php-src/sapi/cli/php.1.in:1.21
--- php-src/sapi/cli/php.1.in:1.20  Mon Apr 23 20:53:55 2007
+++ php-src/sapi/cli/php.1.in   Tue Jan  1 06:22:15 2008
@@ -1,4 +1,4 @@
-.TH PHP 1 2007 The PHP Group Scripting Language
+.TH PHP 1 2008 The PHP Group Scripting Language
 .SH NAME
 .TP 15
 php \- PHP Command Line Interface 'CLI'

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



[PHP-CVS] cvs: php-src /ext/pdo pdo_sql_parser.re

2007-12-30 Thread Sebastian Bergmann
sebastian   Mon Dec 31 07:09:34 2007 UTC

  Modified files:  
/php-src/ext/pdopdo_sql_parser.re 
  Log:
  Bump copyright year, 1 of 2.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.42r2=1.43diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.42 
php-src/ext/pdo/pdo_sql_parser.re:1.43
--- php-src/ext/pdo/pdo_sql_parser.re:1.42  Mon Nov 26 21:10:18 2007
+++ php-src/ext/pdo/pdo_sql_parser.re   Mon Dec 31 07:09:33 2007
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2007 The PHP Group|
+  | Copyright (c) 1997-2008 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.re,v 1.42 2007/11/26 21:10:18 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.43 2007/12/31 07:09:33 sebastian Exp $ */
 
 #include php.h
 #include php_pdo_driver.h

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_sql_parser.re

2007-12-30 Thread Sebastian Bergmann
sebastian   Mon Dec 31 07:15:43 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdopdo_sql_parser.re 
  Log:
  MFH: Bump copyright year, 1 of 2.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.9.2.2r2=1.28.2.4.2.9.2.3diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.2 
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.3
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.2  Mon Nov 26 21:09:50 2007
+++ php-src/ext/pdo/pdo_sql_parser.re   Mon Dec 31 07:15:43 2007
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2007 The PHP Group|
+  | Copyright (c) 1997-2008 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.2 2007/11/26 21:09:50 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.3 2007/12/31 07:15:43 sebastian Exp 
$ */
 
 #include php.h
 #include php_pdo_driver.h

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_sql_parser.re

2007-12-30 Thread Sebastian Bergmann
sebastian   Mon Dec 31 07:17:40 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdopdo_sql_parser.re 
  Log:
  MFH: Bump copyright year, 1 of 2.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.11r2=1.28.2.4.2.12diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.11 
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.12
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.11 Mon Nov 26 21:10:41 2007
+++ php-src/ext/pdo/pdo_sql_parser.re   Mon Dec 31 07:17:40 2007
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2007 The PHP Group|
+  | Copyright (c) 1997-2008 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.11 2007/11/26 21:10:41 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.12 2007/12/31 07:17:40 sebastian Exp $ 
*/
 
 #include php.h
 #include php_pdo_driver.h

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



[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2007-09-27 Thread Sebastian Bergmann
sebastian   Thu Sep 27 18:15:22 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Fugbix typo.
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.6r2=1.2027.2.547.2.965.2.7diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.6 php-src/NEWS:1.2027.2.547.2.965.2.7
--- php-src/NEWS:1.2027.2.547.2.965.2.6 Thu Sep 27 18:00:36 2007
+++ php-src/NEWSThu Sep 27 18:15:22 2007
@@ -1,7 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 20??, PHP 5.3.0
-- Improved memory usage by movig constants to read only memory. (Dmitry,Pierre)
+- Improved memory usage by moving constants to read only memory.
+  (Dmitry,Pierre)
 - Improved ext/soap to support element names in context of XMLShema's any.
   (Dmitry)
 - Improved ext/openssl (Dmitry)

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



[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in /main php_version.h

2007-09-26 Thread Sebastian Bergmann
sebastian   Thu Sep 27 05:24:23 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   php_version.h 
/php-srcconfigure.in 
  Log:
  Bump version.
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.50r2=1.112.2.37.2.50.2.1diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.50 
php-src/main/php_version.h:1.112.2.37.2.50.2.1
--- php-src/main/php_version.h:1.112.2.37.2.50  Thu Aug 30 07:40:13 2007
+++ php-src/main/php_version.h  Thu Sep 27 05:24:22 2007
@@ -1,8 +1,8 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 5
+#define PHP_MINOR_VERSION 3
+#define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.2.5-dev
-#define PHP_VERSION_ID 50205
+#define PHP_VERSION 5.3.0-dev
+#define PHP_VERSION_ID 50300
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77r2=1.579.2.52.2.77.2.1diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77 
php-src/configure.in:1.579.2.52.2.77.2.1
--- php-src/configure.in:1.579.2.52.2.77Thu Aug 30 07:40:13 2007
+++ php-src/configure.inThu Sep 27 05:24:22 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77 2007/08/30 07:40:13 sebastian Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.1 2007/09/27 05:24:22 sebastian Exp $ 
-*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -40,8 +40,8 @@
 AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
-PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=5
+PHP_MINOR_VERSION=3
+PHP_RELEASE_VERSION=0
 PHP_EXTRA_VERSION=-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`

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



[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c

2007-08-20 Thread Sebastian Bergmann
sebastian   Mon Aug 20 17:01:59 2007 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
  Log:
  - MFB: Fugbix typo.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.281r2=1.282diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.281 
php-src/ext/reflection/php_reflection.c:1.282
--- php-src/ext/reflection/php_reflection.c:1.281   Fri Aug 17 14:21:00 2007
+++ php-src/ext/reflection/php_reflection.c Mon Aug 20 17:01:59 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.281 2007/08/17 14:21:00 johannes Exp $ */
+/* $Id: php_reflection.c,v 1.282 2007/08/20 17:01:59 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2778,7 +2778,7 @@
 /* }}} */
 
 /* {{{ proto public mixed ReflectionClass::getStaticPropertyValue(string name 
[, mixed default]) U
-   Returns the value of a tsstic property */
+   Returns the value of a static property */
 ZEND_METHOD(reflection_class, getStaticPropertyValue)
 {
reflection_object *intern;
@@ -5022,7 +5022,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.281 
2007/08/17 14:21:00 johannes Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.282 
2007/08/20 17:01:59 sebastian Exp $);
 
php_info_print_table_end();
 } /* }}} */

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection php_reflection.c

2007-08-20 Thread Sebastian Bergmann
sebastian   Mon Aug 20 17:01:22 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/reflection php_reflection.c 
  Log:
  - Fugbix typo.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.44r2=1.164.2.33.2.45diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.44 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.44 Fri Aug 17 
14:21:32 2007
+++ php-src/ext/reflection/php_reflection.c Mon Aug 20 17:01:22 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.44 2007/08/17 14:21:32 johannes Exp $ 
*/
+/* $Id: php_reflection.c,v 1.164.2.33.2.45 2007/08/20 17:01:22 sebastian Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2732,7 +2732,7 @@
 /* }}} */
 
 /* {{{ proto public mixed ReflectionClass::getStaticPropertyValue(string name 
[, mixed default])
-   Returns the value of a tsstic property */
+   Returns the value of a static property */
 ZEND_METHOD(reflection_class, getStaticPropertyValue)
 {
reflection_object *intern;
@@ -4903,7 +4903,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.44 2007/08/17 14:21:32 johannes Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.45 2007/08/20 17:01:22 sebastian Exp $);
 
php_info_print_table_end();
 } /* }}} */

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



[PHP-CVS] cvs: php-src / README.namespaces

2007-08-02 Thread Sebastian Bergmann
sebastian   Thu Aug  2 17:02:41 2007 UTC

  Modified files:  
/php-srcREADME.namespaces 
  Log:
  Done: Make ext/tokenizer package-aware. (Johannes)
  
http://cvs.php.net/viewvc.cgi/php-src/README.namespaces?r1=1.3r2=1.4diff_format=u
Index: php-src/README.namespaces
diff -u php-src/README.namespaces:1.3 php-src/README.namespaces:1.4
--- php-src/README.namespaces:1.3   Tue Jul 31 16:03:45 2007
+++ php-src/README.namespaces   Thu Aug  2 17:02:41 2007
@@ -121,5 +121,3 @@
 + getFiles()
 
   * Add getNamespace() methods to ReflectionClass and ReflectionFunction 
-
-* Make ext/tokenizer package-aware

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



[PHP-CVS] cvs: php-src / README.namespaces

2007-07-31 Thread Sebastian Bergmann
sebastian   Tue Jul 31 16:03:45 2007 UTC

  Modified files:  
/php-srcREADME.namespaces 
  Log:
  Add ext/tokenizer support to the TODO.
  
http://cvs.php.net/viewvc.cgi/php-src/README.namespaces?r1=1.2r2=1.3diff_format=u
Index: php-src/README.namespaces
diff -u php-src/README.namespaces:1.2 php-src/README.namespaces:1.3
--- php-src/README.namespaces:1.2   Mon Jul 30 16:20:46 2007
+++ php-src/README.namespaces   Tue Jul 31 16:03:45 2007
@@ -121,3 +121,5 @@
 + getFiles()
 
   * Add getNamespace() methods to ReflectionClass and ReflectionFunction 
+
+* Make ext/tokenizer package-aware

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



[PHP-CVS] cvs: php-src / README.namespaces

2007-07-30 Thread Sebastian Bergmann
sebastian   Mon Jul 30 16:20:46 2007 UTC

  Modified files:  
/php-srcREADME.namespaces 
  Log:
  Start TODO for namespaces/packages.
  
http://cvs.php.net/viewvc.cgi/php-src/README.namespaces?r1=1.1r2=1.2diff_format=u
Index: php-src/README.namespaces
diff -u php-src/README.namespaces:1.1 php-src/README.namespaces:1.2
--- php-src/README.namespaces:1.1   Mon Jul 23 16:06:25 2007
+++ php-src/README.namespaces   Mon Jul 30 16:20:46 2007
@@ -1,3 +1,6 @@
+Design
+==
+
 Main assumption of the model is that the problem that we are to solve is the
 problem of the very long class names in PHP libraries. We would not attempt
 to take autoloader's job or create packaging model - only make names
@@ -100,4 +103,21 @@
 it tries to find class A::B (__autoload() it if necessary) and call its
 static function foo() 
 7) qualified class names are interpreted as class from corresponding
-namespace. So new A::B::C() creates class C from namespace A::B.
\ No newline at end of file
+namespace. So new A::B::C() creates class C from namespace A::B.
+
+
+TODO
+
+
+* Rename namespaces to packages?
+
+* Extend the Reflection API
+
+  * Add ReflectionPackage class
+
++ getName()
++ getClasses()
++ getFunctions()
++ getFiles()
+
+  * Add getNamespace() methods to ReflectionClass and ReflectionFunction 

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



[PHP-CVS] cvs: php-src / NEWS

2007-04-03 Thread Sebastian Bergmann
sebastian   Tue Apr  3 06:56:39 2007 UTC

  Modified files:  
/php-srcNEWS 
  Log:
  Fugbix typo.
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2143r2=1.2144diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2143 php-src/NEWS:1.2144
--- php-src/NEWS:1.2143 Tue Apr  3 06:32:59 2007
+++ php-src/NEWSTue Apr  3 06:56:39 2007
@@ -13,7 +13,7 @@
 - Changed allow_url_fopen/allow_url_include to allow
   per-wrapper enable/disable and runtime tightening. (Sara)
 
-- Removed undocumnted and incomplete support for strings in list() operator.
+- Removed undocumented and incomplete support for strings in list() operator.
   (Dmitry)
 - Removed old legacy:
   . register_globals support. (Pierre)

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection php_reflection.c

2007-03-15 Thread Sebastian Bergmann
sebastian   Fri Mar 16 06:41:24 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/reflection php_reflection.c 
  Log:
  Fugbix typo.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.34r2=1.164.2.33.2.35diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.34 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.35
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.34 Sat Feb 10 
20:52:42 2007
+++ php-src/ext/reflection/php_reflection.c Fri Mar 16 06:41:24 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.34 2007/02/10 20:52:42 tony2001 Exp $ 
*/
+/* $Id: php_reflection.c,v 1.164.2.33.2.35 2007/03/16 06:41:24 sebastian Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -271,7 +271,7 @@
return retval;
 }
 
-static zval * reflection_instanciate(zend_class_entry *pce, zval *object 
TSRMLS_DC)
+static zval * reflection_instantiate(zend_class_entry *pce, zval *object 
TSRMLS_DC)
 {
if (!object) {
ALLOC_ZVAL(object);
@@ -1026,7 +1026,7 @@
 
MAKE_STD_ZVAL(name);
ZVAL_STRINGL(name, ce-name, ce-name_length, 1);
-   reflection_instanciate(reflection_class_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_class_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
intern-ptr = ce;
intern-free_ptr = 0;
@@ -1052,7 +1052,7 @@
}
free_alloca(lcname);
 
-   reflection_instanciate(reflection_extension_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_extension_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
MAKE_STD_ZVAL(name);
ZVAL_STRINGL(name, module-name, name_len, 1);
@@ -1076,7 +1076,7 @@
} else {
ZVAL_NULL(name);
}
-   reflection_instanciate(reflection_parameter_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_parameter_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
reference = (parameter_reference*) emalloc(sizeof(parameter_reference));
reference-arg_info = arg_info;
@@ -1099,7 +1099,7 @@
MAKE_STD_ZVAL(name);
ZVAL_STRING(name, function-common.function_name, 1);
 
-   reflection_instanciate(reflection_function_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_function_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
intern-ptr = function;
intern-free_ptr = 0;
@@ -1119,7 +1119,7 @@
MAKE_STD_ZVAL(classname);
ZVAL_STRING(name, method-common.function_name, 1);
ZVAL_STRINGL(classname, ce-name, ce-name_length, 1);
-   reflection_instanciate(reflection_method_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_method_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
intern-ptr = method;
intern-free_ptr = 0;
@@ -1162,7 +1162,7 @@
ZVAL_STRING(name, prop_name, 1);
ZVAL_STRINGL(classname, ce-name, ce-name_length, 1);
 
-   reflection_instanciate(reflection_property_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_property_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
reference = (property_reference*) emalloc(sizeof(property_reference));
reference-ce = ce;
@@ -4889,7 +4889,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.34 2007/02/10 20:52:42 tony2001 Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.35 2007/03/16 06:41:24 sebastian Exp $);
 
php_info_print_table_end();
 } /* }}} */

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



[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c

2007-03-15 Thread Sebastian Bergmann
sebastian   Fri Mar 16 06:42:01 2007 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
  Log:
  MFB: Fugbix typo.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.271r2=1.272diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.271 
php-src/ext/reflection/php_reflection.c:1.272
--- php-src/ext/reflection/php_reflection.c:1.271   Sat Feb 10 20:51:42 2007
+++ php-src/ext/reflection/php_reflection.c Fri Mar 16 06:42:01 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.271 2007/02/10 20:51:42 tony2001 Exp $ */
+/* $Id: php_reflection.c,v 1.272 2007/03/16 06:42:01 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -264,7 +264,7 @@
return retval;
 }
 
-static zval * reflection_instanciate(zend_class_entry *pce, zval *object 
TSRMLS_DC)
+static zval * reflection_instantiate(zend_class_entry *pce, zval *object 
TSRMLS_DC)
 {
if (!object) {
ALLOC_ZVAL(object);
@@ -1038,7 +1038,7 @@
 
MAKE_STD_ZVAL(name);
ZVAL_TEXTL(name, ce-name, ce-name_length, 1);
-   reflection_instanciate(reflection_class_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_class_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
intern-ptr = ce;
intern-free_ptr = 0;
@@ -1064,7 +1064,7 @@
}
free_alloca(lcname);
 
-   reflection_instanciate(reflection_extension_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_extension_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
MAKE_STD_ZVAL(name);
ZVAL_ASCII_STRINGL(name, module-name, name_len, 1);
@@ -1088,7 +1088,7 @@
} else {
ZVAL_NULL(name);
}
-   reflection_instanciate(reflection_parameter_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_parameter_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
reference = (parameter_reference*) emalloc(sizeof(parameter_reference));
reference-arg_info = arg_info;
@@ -,7 +,7 @@
MAKE_STD_ZVAL(name);
ZVAL_TEXT(name, function-common.function_name, 1);
 
-   reflection_instanciate(reflection_function_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_function_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
intern-ptr = function;
intern-free_ptr = 0;
@@ -1131,7 +1131,7 @@
MAKE_STD_ZVAL(classname);
ZVAL_TEXT(name, method-common.function_name, 1);
ZVAL_TEXTL(classname, ce-name, ce-name_length, 1);
-   reflection_instanciate(reflection_method_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_method_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
intern-ptr = method;
intern-free_ptr = 0;
@@ -1176,7 +1176,7 @@
ZVAL_TEXT(name, prop_name, 1);
ZVAL_TEXTL(classname, ce-name, ce-name_length, 1);
 
-   reflection_instanciate(reflection_property_ptr, object TSRMLS_CC);
+   reflection_instantiate(reflection_property_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object 
TSRMLS_CC);
reference = (property_reference*) emalloc(sizeof(property_reference));
reference-ce = ce;
@@ -4987,7 +4987,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.271 
2007/02/10 20:51:42 tony2001 Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.272 
2007/03/16 06:42:01 sebastian Exp $);
 
php_info_print_table_end();
 } /* }}} */

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



[PHP-CVS] cvs: php-src /ext/session mod_files.c session.c

2007-01-05 Thread Sebastian Bergmann
sebastian   Fri Jan  5 14:53:31 2007 UTC

  Modified files:  
/php-src/ext/sessionmod_files.c session.c 
  Log:
  Fix ZTS issues.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.109r2=1.110diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.109 
php-src/ext/session/mod_files.c:1.110
--- php-src/ext/session/mod_files.c:1.109   Fri Jan  5 02:07:59 2007
+++ php-src/ext/session/mod_files.c Fri Jan  5 14:53:30 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mod_files.c,v 1.109 2007/01/05 02:07:59 pollita Exp $ */
+/* $Id: mod_files.c,v 1.110 2007/01/05 14:53:30 sebastian Exp $ */
 
 #include php.h
 
@@ -94,7 +94,7 @@
return ret;
 }
 
-static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, 
const char *key)
+static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, 
const char *key TSRMLS_DC)
 {
size_t key_len;
const char *p;
@@ -180,7 +180,7 @@
PS(invalid_session_id) = 1;
return;
}
-   if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+   if (!ps_files_path_create(buf, sizeof(buf), data, key 
TSRMLS_CC)) {
return;
}
 
@@ -430,7 +430,7 @@
char buf[MAXPATHLEN];
PS_FILES_DATA;
 
-   if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+   if (!ps_files_path_create(buf, sizeof(buf), data, key TSRMLS_CC)) {
return FAILURE;
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.464r2=1.465diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.464 php-src/ext/session/session.c:1.465
--- php-src/ext/session/session.c:1.464 Fri Jan  5 03:57:57 2007
+++ php-src/ext/session/session.c   Fri Jan  5 14:53:30 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.464 2007/01/05 03:57:57 pollita Exp $ */
+/* $Id: session.c,v 1.465 2007/01/05 14:53:30 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1546,7 +1546,7 @@
int id_len;
UErrorCode status = U_ZERO_ERROR;
 
-   
zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), id, 
id_len, name.u, name_len, status TSRMLS_CC);
+   
zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), id, 
id_len, name.u, name_len, status);
 
if (U_SUCCESS(status)  id) {
PS(id) = id;

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl multi.c

2006-10-05 Thread Sebastian Bergmann
sebastian   Fri Oct  6 03:48:00 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   multi.c 
  Log:
  Fix ZTS build.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/multi.c?r1=1.19.2.3.2.5r2=1.19.2.3.2.6diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.19.2.3.2.5 
php-src/ext/curl/multi.c:1.19.2.3.2.6
--- php-src/ext/curl/multi.c:1.19.2.3.2.5   Thu Oct  5 15:06:40 2006
+++ php-src/ext/curl/multi.cFri Oct  6 03:48:00 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: multi.c,v 1.19.2.3.2.5 2006/10/05 15:06:40 tony2001 Exp $ */
+/* $Id: multi.c,v 1.19.2.3.2.6 2006/10/06 03:48:00 sebastian Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -102,6 +102,7 @@
 {
zval *z_ch = (zval *)data;
php_curl *ch;
+   TSRMLS_FETCH();
 
if (!z_ch) {
return;

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



[PHP-CVS] cvs: php-src /ext/curl multi.c

2006-10-05 Thread Sebastian Bergmann
sebastian   Fri Oct  6 03:49:04 2006 UTC

  Modified files:  
/php-src/ext/curl   multi.c 
  Log:
  MFB: Fix ZTS build.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/multi.c?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.27 php-src/ext/curl/multi.c:1.28
--- php-src/ext/curl/multi.c:1.27   Thu Oct  5 15:06:11 2006
+++ php-src/ext/curl/multi.cFri Oct  6 03:49:04 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: multi.c,v 1.27 2006/10/05 15:06:11 tony2001 Exp $ */
+/* $Id: multi.c,v 1.28 2006/10/06 03:49:04 sebastian Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -102,6 +102,7 @@
 {
zval *z_ch = (zval *)data;
php_curl *ch;
+   TSRMLS_FETCH();
 
if (!z_ch) {
return;

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



[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/standard http_fopen_wrapper.c

2006-08-16 Thread Sebastian Bergmann
sebastian   Wed Aug 16 08:51:34 2006 UTC

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  Sync with php_trim() API change.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.217r2=1.218diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.217 
php-src/ext/simplexml/simplexml.c:1.218
--- php-src/ext/simplexml/simplexml.c:1.217 Mon Aug 14 11:58:49 2006
+++ php-src/ext/simplexml/simplexml.c   Wed Aug 16 08:51:34 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.217 2006/08/14 11:58:49 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.218 2006/08/16 08:51:34 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -453,7 +453,7 @@
trim_zv = *member;
zval_copy_ctor(trim_zv);
convert_to_string_with_converter(trim_zv, 
UG(utf8_conv));
-   php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0, 
IS_STRING, tmp_zv, 3 TSRMLS_CC);
+   php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0, 
tmp_zv, 3 TSRMLS_CC);
zval_dtor(trim_zv);
member = tmp_zv;
}
@@ -2339,7 +2339,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.217 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.218 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.117r2=1.118diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.117 
php-src/ext/standard/http_fopen_wrapper.c:1.118
--- php-src/ext/standard/http_fopen_wrapper.c:1.117 Thu Jun 29 14:42:30 2006
+++ php-src/ext/standard/http_fopen_wrapper.c   Wed Aug 16 08:51:34 2006
@@ -19,7 +19,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.117 2006/06/29 14:42:30 bjori Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.118 2006/08/16 08:51:34 sebastian Exp $ */ 
 
 #include php.h
 #include php_globals.h
@@ -350,7 +350,7 @@
Z_TYPE_PP(tmpzval) == IS_STRING  Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end,
   php_trim will estrndup() */
-   tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval), 
NULL, 0, IS_STRING, NULL, 3 TSRMLS_CC);
+   tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval), 
NULL, 0, NULL, 3 TSRMLS_CC);
if (strlen(tmp)  0) {
if (!header_init) { /* Remove post headers for 
redirects */
int l = strlen(tmp);
@@ -376,7 +376,7 @@
}
}
efree(tmp_c);
-   tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, 
IS_STRING, NULL, 3 TSRMLS_CC);
+   tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, 
NULL, 3 TSRMLS_CC);
efree(tmp);
tmp = tmp_c;
}

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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2006-05-15 Thread Sebastian Bergmann
sebastian   Mon May 15 16:01:24 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  Fugbix typo.
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.23r2=1.2027.2.547.2.24diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.23 php-src/NEWS:1.2027.2.547.2.24
--- php-src/NEWS:1.2027.2.547.2.23  Mon May 15 15:38:46 2006
+++ php-src/NEWSMon May 15 16:01:24 2006
@@ -6,7 +6,7 @@
 - Optimized request shutdown seequence. Restoring ini directives now does
   iteration only over modified directives instead of all. (Dmitry)
 - FastCGI SAPI improved. (Dmitry)
-  . Remived source compatibility with libfcgi
+  . Removed source compatibility with libfcgi
   . Optimized acess to FastCGI environment variables using HashTable instead
 of linear search
   . Allowed PHP_FCGI_MAX_REQUESTS=0, that assumes no limit

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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2006-05-15 Thread Sebastian Bergmann
sebastian   Mon May 15 16:03:41 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  Fugbix NEWS entries.
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.24r2=1.2027.2.547.2.25diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.24 php-src/NEWS:1.2027.2.547.2.25
--- php-src/NEWS:1.2027.2.547.2.24  Mon May 15 16:01:24 2006
+++ php-src/NEWSMon May 15 16:03:41 2006
@@ -3,11 +3,11 @@
 ?? ??? 2006, PHP 5.2.0
 - Optimized require_once/include_once (eliminated fopen() on second usage).
   (Dmitry)
-- Optimized request shutdown seequence. Restoring ini directives now does
-  iteration only over modified directives instead of all. (Dmitry)
+- Optimized request shutdown sequence. Restoring ini directives now
+  iterated over modified directives only instead of all. (Dmitry)
 - FastCGI SAPI improved. (Dmitry)
   . Removed source compatibility with libfcgi
-  . Optimized acess to FastCGI environment variables using HashTable instead
+  . Optimized access to FastCGI environment variables using HashTable instead
 of linear search
   . Allowed PHP_FCGI_MAX_REQUESTS=0, that assumes no limit
   . Allowed PHP_FCGI_CHILDREN=0, that assumes no worker children (FastCGI

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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2006-05-15 Thread Sebastian Bergmann
sebastian   Mon May 15 16:08:18 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  My bad.
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.25r2=1.2027.2.547.2.26diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.25 php-src/NEWS:1.2027.2.547.2.26
--- php-src/NEWS:1.2027.2.547.2.25  Mon May 15 16:03:41 2006
+++ php-src/NEWSMon May 15 16:08:18 2006
@@ -4,7 +4,7 @@
 - Optimized require_once/include_once (eliminated fopen() on second usage).
   (Dmitry)
 - Optimized request shutdown sequence. Restoring ini directives now
-  iterated over modified directives only instead of all. (Dmitry)
+  iterates over modified directives only instead of all. (Dmitry)
 - FastCGI SAPI improved. (Dmitry)
   . Removed source compatibility with libfcgi
   . Optimized access to FastCGI environment variables using HashTable instead

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



  1   2   3   >