clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,617 Commits 493 Branches 1,365 Tags 848 MiB
6fc2962b9a
Commit Graph

71617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars Strojny
6fc2962b9a Merge branch 'PHP-5.4' 2012-09-02 22:11:47 +02:00
Lars Strojny
a26390ef0c Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false 2012-09-02 22:10:23 +02:00
Nikita Popov
cdb9fe99c2 Merge remote-tracking branch 'reeze/add-reflection-isGenerator' 2012-09-02 17:40:23 +02:00
Reeze Xia
ad0da9ae60 Implemented ReflectionFunction::isGenerator() 2012-09-02 23:29:56 +08:00
Lars Strojny
352a1956b6 Allow null as a default value for length in mb_substr() and mb_strcut() 2012-09-02 15:02:26 +02:00
Lars Strojny
d371a306a2 Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4 2012-09-02 14:53:52 +02:00
Lars Strojny
133f610bb1 Allow null as a default value for length in mb_substr() and mb_strcut() 2012-09-02 14:52:05 +02:00
Xinchen Hui
32a97dfae6 Merge branch 'PHP-5.4' 2012-09-02 16:53:31 +08:00
Xinchen Hui
069c448623 folder 2012-09-02 16:52:53 +08:00
Lars Strojny
89948c7fbe Initializing optional argument description in assert() 2012-09-02 08:01:32 +02:00
Lars Strojny
e212de4a44 Initializing optional argument description in assert() 2012-09-02 08:01:18 +02:00
Xinchen Hui
4e84f72554 Fix test failed due to new Token T_YIELD 2012-09-02 13:15:23 +08:00
Stanislav Malyshev
664e763c2c Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix NEWS
 2012-09-01 17:00:01 -07:00
Stanislav Malyshev
f7d51df5c6 fix NEWS 2012-09-01 16:57:29 -07:00
Nikita Popov
dffffdeb3d Fix leak when yielding array as key 
The code was copy-pasted and I forgot to change OP1 to OP2 in that one
place.
 2012-09-01 20:31:40 +02:00
Nikita Popov
1b5b839312 Drop obsolete test 2012-09-01 20:10:12 +02:00
Gustavo Lopes
53351d087d Merge branch 'generators' 
* generators: (70 commits)
  Fix typos
  Fix segfault when traversing a by-ref generator twice
  Make sure that exception is thrown on rewind() after closing too
  Remove implementation stubs for yield delegation
  Fix several issues and allow rewind only at/before first yield
  Run finally if generator is closed before finishing
  Finally with return now works in generators too
  Add dedicated opcode for returns from a generator
  Disallow serialization and unserialization
  Fix zts build (typo)
  Drop Generator::close() method
  Forgot to add test
  Support trivial finally in generators (no yield, no return)
  Fix implementation of Iterator interface
  Add T_YIELD in tokenizer_data.c
  Throw error also for return occuring before yield
  Fix throwing of exceptions within a generator
  Remove reference restrictions from foreach
  Require parenthesis around yield expressions
  Add some more tests
  ...
 2012-09-01 19:07:20 +02:00
Xinchen Hui
7b5960b085 Merge branch 'PHP-5.4' 2012-09-01 14:38:33 +08:00
Xinchen Hui
f3108b5f81 Remove extra blank in notice message, should act as same as vm 2012-09-01 14:37:45 +08:00
Xinchen Hui
59e34bad32 Merge branch 'PHP-5.4' 2012-09-01 14:27:59 +08:00
Xinchen Hui
863e7e0acb Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/spl/spl_array.c
 2012-09-01 14:27:09 +08:00
Xinchen Hui
67d7d03f00 Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables) 
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
 2012-09-01 14:21:34 +08:00
Lars Strojny
e658a91b3d assert() user message 
Added 2nd, optional, param to assert. When passed in it will be added
to the printed warnings and passed as a 4th param to a callback. PR 150
by Lonny Kapelushnik
 2012-08-31 19:04:53 +02:00
Lars Strojny
64c168efc5 Tests for the previous assert() with user message 2012-08-31 19:01:57 +02:00
Lars Strojny
167108d73c assert() user message 
Added 2nd, optional, param to assert. When passed in it will be added
to the printed warnings and passed as a 4th param to a callback. PR 150
by Lonny Kapelushnik
 2012-08-31 18:55:43 +02:00
Xinchen Hui
b5d2c3174f Merge branch 'PHP-5.4' 2012-08-31 11:25:21 +08:00
Xinchen Hui
66fad45724 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-31 11:24:10 +08:00
Xinchen Hui
5dc2cef370 Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes) 2012-08-31 11:22:43 +08:00
Felipe Pena
8afb848e18 - BFN 2012-08-30 09:33:35 -03:00
Felipe Pena
5e51209785 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
 2012-08-30 09:32:34 -03:00
Felipe Pena
eb8d603d46 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
 2012-08-30 09:32:26 -03:00
Felipe Pena
de884997e0 - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry) 2012-08-30 09:32:13 -03:00
Nikita Popov
dbc7809b17 Fix typos 2012-08-29 20:49:14 +02:00
Nikita Popov
bef79588d5 Fix segfault when traversing a by-ref generator twice 
If you try to traverse an already closed generator an exception will now be
thrown.

Furthermore this changes the error for traversing a by-val generator by-ref
from an E_ERROR to an Exception.
 2012-08-29 20:46:56 +02:00
Nikita Popov
cc07038fa9 Make sure that exception is thrown on rewind() after closing too 2012-08-29 20:31:34 +02:00
Anatoliy Belsky
747d2f8417 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated mpir version
  Fixed defective cloning in ext/intl classes
 2012-08-29 17:56:42 +02:00
Anatoliy Belsky
677de8568a updated mpir version 2012-08-29 17:49:02 +02:00
Gustavo André dos Santos Lopes
521ab78788 Merge 5.3 with strategy ours 
* origin/PHP-5.3:
  Fixed defective cloning in ext/intl classes
 2012-08-29 14:30:47 +01:00
Stanislav Malyshev
bab8167553 Merge branch 'PHP-5.4' 2012-08-28 22:11:24 -07:00
Stanislav Malyshev
55b3386a81 update version id too 2012-08-28 22:10:34 -07:00
Stanislav Malyshev
78cffe0c4d 5.4.7 branched 2012-08-28 22:07:08 -07:00
Stanislav Malyshev
ab566a9712 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix bug #55856: preg_replace should fail on trailing garbage
  Bug #62956: fixing private method signature validation
  NEWS for 886a50a
 2012-08-28 22:02:15 -07:00
Stanislav Malyshev
8b3c1a380a fix bug #55856: preg_replace should fail on trailing garbage 2012-08-28 21:59:20 -07:00
Lars Strojny
6b1073a3a7 Bug #62956: fixing private method signature validation 
In inheritance, if both methods are private, don not enforce the same
signature.
 2012-08-28 14:10:25 +02:00
Lars Strojny
f82dd2c774 Bug #62956: fixing private method signature validation 
In inheritance, if both methods are private, don not enforce the same
signature.
 2012-08-28 14:06:18 +02:00
Felipe Pena
dd9478e6c8 - Fixed compiler warnings 2012-08-27 08:56:54 -03:00
Xinchen Hui
cec1786911 Fixed bug #62938 (zend_do_bind_catch() used without declaration) 2012-08-27 10:23:23 +08:00
Gustavo Lopes
0410b4e60f Fixed defective cloning in ext/intl classes 
See also bug #62915

Cherry picked from 886a50a (I forgot about 5.3)

Conflicts:
	ext/intl/spoofchecker/spoofchecker_class.c
	ext/intl/transliterator/transliterator_class.c
 2012-08-26 23:53:57 +02:00
Gustavo Lopes
c11106734d NEWS for 886a50a 2012-08-26 23:47:00 +02:00
Gustavo Lopes
dacd11ea89 Fixed cloning in ext/intl classes; master specific 2012-08-26 23:44:54 +02:00