archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
102961 commits 526 branches 1434 tags 880 MiB
Commit graph

2746 commits

Author SHA1 Message Date
Aaron Piotrowski
40dcc1b57c Merge branch 'PHP-7.1' 2016-08-16 13:06:06 -05:00
Aaron Piotrowski
6fcedc96fb Fix closure tests using ReflectionType::__toString() 2016-08-16 13:05:51 -05:00
Nikita Popov
befca6a283 Merge branch 'PHP-7.1' 2016-08-16 12:43:46 +02:00
Nikita Popov
1397f754c8 Fix handling of qualified nullable parameter types 
compile_typename() can't deal with TYPE_NULLABLE flags, drop it
beforehand.
 2016-08-16 12:43:17 +02:00
Danack
0fbaf3c820 Add test. 2016-08-13 21:59:31 +01:00
Xinchen Hui
7ec53e8ff2 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWs
  Fixed bug #72813 (Segfault with __get returned by ref)
  Fix URL rewriter partially
 2016-08-12 16:37:14 +08:00
Xinchen Hui
dd618664a0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72813 (Segfault with __get returned by ref)
  Fix URL rewriter partially

Conflicts:
	Zend/zend_object_handlers.c
	ext/standard/url_scanner_ex.c
	ext/standard/url_scanner_ex.re
 2016-08-12 16:35:41 +08:00
Xinchen Hui
e03480bfab Fixed bug #72813 (Segfault with __get returned by ref) 
This should be safe change, as we don't dereference value and member
after calling setter/getter.

And compare to adding unref codes, this is much cheaper.
 2016-08-12 16:24:46 +08:00
Nikita Popov
d4bbbc4aa6 Merge branch 'PHP-7.1' 2016-08-11 18:45:42 +02:00
Andrea Faulds
1dab96c1db Show "or null" in TypeErrors for nullable arg_infos 2016-08-11 18:44:43 +02:00
Sara Golemon
9c3865eb6a [ast] Fix exporting **= in expansion of assign op 2016-08-06 15:35:45 -07:00
Nikita Popov
3859bcd1f8 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-05 19:56:27 +02:00
Nikita Popov
807e81937b Fix bug #72767 
The page size calculation did not account for the size of the
stack header (or rather it did account for it, but in the wrong
direction...)
 2016-08-05 19:55:10 +02:00
Nikita Popov
3b48c5a36f Revert "Make call_user_func() on reference args consistent" 
This reverts commit fafe01b07b.

See bug #72698, there is code using this behavior. Reverting for
PHP 7.0 *only*. The fix is still in PHP 7.1.
 2016-07-28 18:45:44 +02:00
Bob Weinand
35764e3579 Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-07-23 16:40:02 +02:00
Bob Weinand
6046acf93e Fix ClosedGeneratorException possibly thrown into wrong scope 2016-07-23 16:39:21 +02:00
Xinchen Hui
9254f5d5d3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72629 (Caught exception assignment to variables ignores references).

Conflicts:
	main/php_version.h
 2016-07-20 17:00:09 +08:00
Xinchen Hui
97c0b133c5 Fixed bug #72629 (Caught exception assignment to variables ignores references). 2016-07-20 16:59:14 +08:00
Nikita Popov
0242845536 Merge branch 'PHP-7.0' 2016-07-16 23:03:01 +02:00
Nikita Popov
31cbe23a9a Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_gc.c
 2016-07-16 23:02:34 +02:00
Nikita Popov
171c759d79 Revert "Fixed bug #72286 (Segmentation fault During Garbage Collection)" 
This reverts commit 1c84b55ade.
 2016-07-16 23:02:23 +02:00
Dmitry Stogov
92e158e3c4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72286 (Segmentation fault During Garbage Collection)
 2016-07-14 22:39:15 +03:00
Dmitry Stogov
99a5170781 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #72286 (Segmentation fault During Garbage Collection)
 2016-07-14 22:38:47 +03:00
Dmitry Stogov
1c84b55ade Fixed bug #72286 (Segmentation fault During Garbage Collection) 2016-07-14 22:37:25 +03:00
Nikita Popov
e3e400c983 Fix return from by-ref generators 2016-07-14 15:44:04 +02:00
Dmitry Stogov
8fc934b0a1 Fixed bug #71818 (Memory leak when array altered in destructor) 2016-07-14 12:05:44 +03:00
Xinchen Hui
efdc8ccd52 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals)

Conflicts:
	Zend/zend_compile.c
 2016-07-14 13:38:27 +08:00
Xinchen Hui
8c5b27e061 Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals) 2016-07-14 13:36:43 +08:00
Dmitry Stogov
e6f04d4c8e Unified behavior of modification of returned by reference value in finnally code. 2016-07-13 20:35:53 +03:00
Dmitry Stogov
02dca0cf16 Removed wrong warning 2016-07-13 20:04:47 +03:00
Dmitry Stogov
afd3e39d66 Fixed bug #29368 (The destructor is called when an exception is thrown from the constructor). 2016-07-13 16:43:47 +03:00
Dmitry Stogov
3b8cb2119b Fixed bug #72347 (VERIFY_RETURN type casts visible in finally) 
Fixed bug #72216 (Return by reference with finally is not memory safe)
Fixed bug #72215 (Wrong return value if var modified in finally)
 2016-07-13 15:08:28 +03:00
Xinchen Hui
0478e431cf Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72581 (previous property undefined in Exception after deserialization)

Conflicts:
	Zend/zend_exceptions.c
 2016-07-12 11:52:21 +08:00
Xinchen Hui
42902919bc Fixed bug #72581 (previous property undefined in Exception after deserialization) 2016-07-12 11:51:20 +08:00
Nikita Popov
5f6effed43 Add opcodes to zend_wrong_string_offset() 2016-07-10 15:15:34 +02:00
Dmitry Stogov
fbca255cd0 Fixed bug #71539 (Memory error on $arr[$a] =& $arr[$b] if RHS rehashes) 2016-07-07 00:59:44 +03:00
Nikita Popov
ab304579ff Forbid use of array() in nested destructuring 
Previously array() was only forbidden on the outermost level.
 2016-07-06 21:15:54 +02:00
Dmitry Stogov
023b812593 Fixed bug #72543 (Different references behavior comparing to PHP 5) 2016-07-06 20:46:43 +03:00
Nikita Popov
dbe6a23194 Closure::fromCallable(): Getting non-static method statically 
As this is new functionality, I'm going directly for a TypeError,
rather than a deprecation warning.
 2016-07-05 15:52:03 +02:00
Nikita Popov
ceae9fb540 Closure::fromCallable(): Better LSB handling 
The previous fix missed the "late" part of "late static binding" :)
 2016-07-05 15:44:17 +02:00
Nikita Popov
e959a9b652 Closure::fromCallable(): Fix late static binding 2016-07-05 15:31:11 +02:00
Nikita Popov
e395b62c51 Closure::fromCallable(): Use fake closures 2016-07-05 15:13:51 +02:00
Nikita Popov
03fbc27f07 Closure::fromCallable(): Fix test files and names 2016-07-05 15:13:51 +02:00
Nikita Popov
2b46e3c710 Merge branch 'PHP-7.0' 2016-07-05 14:34:20 +02:00
Nikita Popov
8a555d7c66 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2016-07-05 14:32:38 +02:00
Pedro Magalhães
08777e9615 Don't enforce LSP if prototype method is private 
Fixes bug #72496.
 2016-07-05 14:30:22 +02:00
Joe Watkins
f4a6b74667 Merge branch 'pull-request/1906' 2016-07-05 07:57:06 +01:00
Aaron Piotrowski
d9a9cf8eca Merge branch 'master' into iterable 2016-07-03 22:42:10 -05:00
Xinchen Hui
d1dd474ff9 Fixed bug #72523 (dtrace issue with reflection (failed test)) 2016-07-01 18:50:35 +08:00
Nikita Popov
e48ded4bf8 Merge branch 'PHP-7.0' 2016-06-28 21:36:28 +02:00