[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/sqlite3/libsqlite/php-sqlite3-changes.patch branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c branches/PHP_5_3/ext/sqlite3/libsql
scottmac Fri, 13 May 2011 06:11:06 + Revision: http://svn.php.net/viewvc?view=revisionrevision=310982 Log: Update bundled SQLite to 3.7.6.2 Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/php-sqlite3-changes.patch U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h U php/php-src/trunk/ext/sqlite3/libsqlite/php-sqlite3-changes.patch U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h diffs exceeded maximum size -- 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/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h
scottmac Fri, 13 May 2011 13:51:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=310991 Log: Fix Windows build, this really should be in a patch file / README. I'll fix this up later. Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h U php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:47:50 UTC (rev 310990) +++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:51:07 UTC (rev 310991) @@ -192,7 +192,9 @@ have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by configure. */ -#if HAVE_STDINT_H +#ifdef PHP_WIN32 +#include win32/php_stdint.h +#elif HAVE_STDINT_H #include stdint.h #elif HAVE_INTTYPES_H #include inttypes.h Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:47:50 UTC (rev 310990) +++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:51:07 UTC (rev 310991) @@ -192,7 +192,9 @@ have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by configure. */ -#if HAVE_STDINT_H +#ifdef PHP_WIN32 +#include win32/php_stdint.h +#elif HAVE_STDINT_H #include stdint.h #elif HAVE_INTTYPES_H #include inttypes.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
bjoriFri, 13 May 2011 14:16:10 + Revision: http://svn.php.net/viewvc?view=revisionrevision=310993 Log: Give Olivier Doucet karma for newsweb and qaweb Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-05-13 14:04:38 UTC (rev 310992) +++ SVNROOT/global_avail2011-05-13 14:16:10 UTC (rev 310993) @@ -57,7 +57,7 @@ avail|degeberg|web/php-bugs avail|danielc|web/php avail|ericstewart|web/php/*/archive - +avail|odoucet|web/php-news/,web/qa/ avail|stewartlord,dragoonis,seld|web/php/ # The PHP Presentation Group has access to the presentations on the -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h
Patch has been sent upstream. That's why we have it as patch here and a readme that should be read :) On 13 May 2011 15:51, Scott MacVicar scott...@php.net wrote: scottmac Fri, 13 May 2011 13:51:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=310991 Log: Fix Windows build, this really should be in a patch file / README. I'll fix this up later. Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h U php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:47:50 UTC (rev 310990) +++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:51:07 UTC (rev 310991) @@ -192,7 +192,9 @@ have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by configure. */ -#if HAVE_STDINT_H +#ifdef PHP_WIN32 +#include win32/php_stdint.h +#elif HAVE_STDINT_H #include stdint.h #elif HAVE_INTTYPES_H #include inttypes.h Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:47:50 UTC (rev 310990) +++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:51:07 UTC (rev 310991) @@ -192,7 +192,9 @@ have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by configure. */ -#if HAVE_STDINT_H +#ifdef PHP_WIN32 +#include win32/php_stdint.h +#elif HAVE_STDINT_H #include stdint.h #elif HAVE_INTTYPES_H #include inttypes.h
[PHP-CVS] svn: /SVNROOT/ global_avail
bjoriFri, 13 May 2011 14:24:22 + Revision: http://svn.php.net/viewvc?view=revisionrevision=310994 Log: Alexey has outstanding newsweb patches.. Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-05-13 14:16:10 UTC (rev 310993) +++ SVNROOT/global_avail2011-05-13 14:24:22 UTC (rev 310994) @@ -58,6 +58,7 @@ avail|danielc|web/php avail|ericstewart|web/php/*/archive avail|odoucet|web/php-news/,web/qa/ +avail|shein|web/php-news/ avail|stewartlord,dragoonis,seld|web/php/ # The PHP Presentation Group has access to the presentations on the -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h
I didn't see a readme, i patched upgrade-pcre.php for one and i'll have it patch the other part if needed. On May 13, 2011, at 7:18 AM, Pierre Joye wrote: Patch has been sent upstream. That's why we have it as patch here and a readme that should be read :) On 13 May 2011 15:51, Scott MacVicar scott...@php.net wrote: scottmac Fri, 13 May 2011 13:51:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=310991 Log: Fix Windows build, this really should be in a patch file / README. I'll fix this up later. Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h U php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:47:50 UTC (rev 310990) +++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:51:07 UTC (rev 310991) @@ -192,7 +192,9 @@ have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by configure. */ -#if HAVE_STDINT_H +#ifdef PHP_WIN32 +#include win32/php_stdint.h +#elif HAVE_STDINT_H #include stdint.h #elif HAVE_INTTYPES_H #include inttypes.h Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:47:50 UTC (rev 310990) +++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2011-05-13 13:51:07 UTC (rev 310991) @@ -192,7 +192,9 @@ have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by configure. */ -#if HAVE_STDINT_H +#ifdef PHP_WIN32 +#include win32/php_stdint.h +#elif HAVE_STDINT_H #include stdint.h #elif HAVE_INTTYPES_H #include inttypes.h
[PHP-CVS] svn: /php/php-src/trunk/Zend/ tests/traits/bugs/alias01.phpt tests/traits/language010.phpt zend_compile.c
gron Fri, 13 May 2011 20:28:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=310999
Log:
Fixed a inconsitent condition for aliasing traits.
- missed a failing Traits test, but is now fixed, and the bug covered by a
dedicated test
# Should always comment conditions that go over more than two lines :-/
Changed paths:
A php/php-src/trunk/Zend/tests/traits/bugs/alias01.phpt
U php/php-src/trunk/Zend/tests/traits/language010.phpt
U php/php-src/trunk/Zend/zend_compile.c
Added: php/php-src/trunk/Zend/tests/traits/bugs/alias01.phpt
===
--- php/php-src/trunk/Zend/tests/traits/bugs/alias01.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/bugs/alias01.phpt 2011-05-13
20:28:34 UTC (rev 310999)
@@ -0,0 +1,26 @@
+--TEST--
+Aliases are applied to the correct methods, and only to them.
+--FILE--
+?php
+trait T1 {
+ function m1() { echo T:m1\n; }
+ function m2() { echo T:m2\n; }
+}
+
+class C1 {
+ use T1 { m1 as a1; }
+}
+
+$o = new C1;
+$o-m1();
+$o-a1();
+$o-m2();
+$o-a2();
+
+?
+--EXPECTF--
+T:m1
+T:m1
+T:m2
+
+Fatal error: Call to undefined method C1::a2() in %s on line %d
Modified: php/php-src/trunk/Zend/tests/traits/language010.phpt
===
--- php/php-src/trunk/Zend/tests/traits/language010.phpt2011-05-13
19:56:04 UTC (rev 310998)
+++ php/php-src/trunk/Zend/tests/traits/language010.phpt2011-05-13
20:28:34 UTC (rev 310999)
@@ -27,4 +27,4 @@
?
--EXPECTF--
-Fatal error: Failed to add trait method (world) to the trait table. There is
probably already a trait method with the same name in %s on line %d
\ No newline at end of file
+Fatal error: Trait method world has not been applied, because there are
collisions with other trait methods on MyClass in %s on line %d
\ No newline at end of file
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-05-13 19:56:04 UTC (rev
310998)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-05-13 20:28:34 UTC (rev
310999)
@@ -3662,10 +3662,13 @@
/* apply aliases which are qualified with a class name, there should
not be any ambiguity */
if (aliases) {
while (aliases[i]) {
- if (!aliases[i]-trait_method-ce || (fn-common.scope
== aliases[i]-trait_method-ce
-
(zend_binary_strcasecmp(aliases[i]-trait_method-method_name,
+
+ if (/* Scope unset or equal to the function we compare
to */
+ (!aliases[i]-trait_method-ce || fn-common.scope ==
aliases[i]-trait_method-ce)
+ /* and, the alias applies to fn */
+ (zend_binary_strcasecmp(aliases[i]-trait_method-method_name,
aliases[i]-trait_method-mname_len,
-
fn-common.function_name,
fnname_len) == 0))) {
+
fn-common.function_name,
fnname_len) == 0)) {
if (aliases[i]-alias) {
fn_copy = *fn;
zend_traits_duplicate_function(fn_copy, estrndup(aliases[i]-alias,
aliases[i]-alias_len) TSRMLS_CC);
@@ -3703,10 +3706,12 @@
if (aliases) {
i = 0;
while (aliases[i]) {
- if ((!aliases[i]-trait_method-ce ||
fn-common.scope == aliases[i]-trait_method-ce)
-
(zend_binary_strcasecmp(aliases[i]-trait_method-method_name,
-
aliases[i]-trait_method-mname_len,
-
fn-common.function_name, fnname_len) == 0)) {
+ if (/* Scope unset or equal to the function we
compare to */
+(!aliases[i]-trait_method-ce || fn-common.scope ==
aliases[i]-trait_method-ce)
+ /* and, the alias applies to fn */
+
(zend_binary_strcasecmp(aliases[i]-trait_method-method_name,
+aliases[i]-trait_method-mname_len,
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/filter/tests/bug52209.phpt trunk/ext/filter/tests/bug52209.phpt
rasmus Fri, 13 May 2011 21:54:25 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311000 Log: Make sure 'E' is included in the variables_order, otherwise this test won't work. Changed paths: U php/php-src/branches/PHP_5_3/ext/filter/tests/bug52209.phpt U php/php-src/trunk/ext/filter/tests/bug52209.phpt Modified: php/php-src/branches/PHP_5_3/ext/filter/tests/bug52209.phpt === --- php/php-src/branches/PHP_5_3/ext/filter/tests/bug52209.phpt 2011-05-13 20:28:34 UTC (rev 310999) +++ php/php-src/branches/PHP_5_3/ext/filter/tests/bug52209.phpt 2011-05-13 21:54:25 UTC (rev 311000) @@ -2,6 +2,8 @@ Bug #52209 (INPUT_ENV returns NULL for set variables (CLI)) --SKIPIF-- ?php if (!extension_loaded(filter) || !empty($_ENV['PWD'])) die(skip); ? +--INI-- +variables_order=GPCSE --FILE-- ?php var_dump(filter_input(INPUT_ENV, 'PWD')); Modified: php/php-src/trunk/ext/filter/tests/bug52209.phpt === --- php/php-src/trunk/ext/filter/tests/bug52209.phpt2011-05-13 20:28:34 UTC (rev 310999) +++ php/php-src/trunk/ext/filter/tests/bug52209.phpt2011-05-13 21:54:25 UTC (rev 311000) @@ -2,6 +2,8 @@ Bug #52209 (INPUT_ENV returns NULL for set variables (CLI)) --SKIPIF-- ?php if (!extension_loaded(filter) || !empty($_ENV['PWD'])) die(skip); ? +--INI-- +variables_order=GPCSE --FILE-- ?php var_dump(filter_input(INPUT_ENV, 'PWD')); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
rasmus Fri, 13 May 2011 22:39:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311005 Log: karma for Andrew Curioso Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-05-13 21:59:24 UTC (rev 311004) +++ SVNROOT/global_avail2011-05-13 22:39:35 UTC (rev 311005) @@ -16,7 +16,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,! tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor +avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,! tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor # Engine karma is further restricted (this line MUST come after lines granting # php-src karma and before lines granting Zend/TSRM karma) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/reflection/tests/ ReflectionClass_isCloneable_001.phpt
felipe Sat, 14 May 2011 01:00:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311006
Log:
- Fix test
Changed paths:
U
php/php-src/trunk/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
Modified:
php/php-src/trunk/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
===
--- php/php-src/trunk/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
2011-05-13 22:39:35 UTC (rev 311005)
+++ php/php-src/trunk/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
2011-05-14 01:00:59 UTC (rev 311006)
@@ -1,5 +1,7 @@
--TEST--
Testing ReflectionClass::isCloneable()
+--SKIPIF--
+?php if (!extension_loaded('simplexml') || !extension_loaded('xmlwriter'))
die(skip SimpleXML and XMLWriter is required for this test); ?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
rasmus Fri, 13 May 2011 07:34:46 + Revision: http://svn.php.net/viewvc?view=revisionrevision=310984 Log: tests and doc karma for jeraimee Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-05-13 07:00:45 UTC (rev 310983) +++ SVNROOT/global_avail2011-05-13 07:34:46 UTC (rev 310984) @@ -241,7 +241,7 @@ avail|val|pecl/bcompiler,phpdoc avail|simenec,ttk|pecl/maxdb,phpdoc/en/reference avail|ksadlocha|pecl/simplesql -avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine|php/php-src/*/tests,phpdoc +avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine,jeraimee|php/php-src/*/tests,phpdoc avail|blindman|pecl/colorer avail|mike|pecl/http avail|gabe|pecl/intercept -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
