summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-221-0/+1
|\
| * Fix bug #69579John Boehr2016-09-221-0/+1
| |
* | Merge branch 'PHP-7.0'Nikita Popov2016-07-051-2/+2
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-051-2/+2
| | | | | | | | | | Conflicts: Zend/zend_compile.c
* | Swap type check orderAaron Piotrowski2016-06-291-12/+22
| |
* | Limit covariance to array and TraversableAaron Piotrowski2016-06-051-12/+3
| |
* | Fix abort too earlyAaron Piotrowski2016-06-051-10/+12
| |
* | Covariance on inheriting classes with iterableAaron Piotrowski2016-06-041-0/+29
| |
* | Merge branch 'nullable_types' of github.com:morrisonlevi/php-srcDmitry Stogov2016-05-231-5/+11
|\ \ | | | | | | | | | | | | | | | | | | * 'nullable_types' of github.com:morrisonlevi/php-src: Fix bug #71428 Add nullable parameter types Implement nullable return types.
| * | Fix bug #71428Levi Morrison2016-05-051-2/+0
| | | | | | | | | | | | This also affects bug #72119
| * | Add nullable parameter typesLevi Morrison2016-05-051-5/+5
| | | | | | | | | | | | This works off of Dmitry's commit for nullable return types
| * | Implement nullable return types.Dmitry Stogov2016-05-051-1/+9
| | |
* | | Fixed typoDmitry Stogov2016-05-061-1/+1
| | |
* | | Revert "Refactor zval cleanup into single function"Dmitry Stogov2016-05-061-1/+1
| | | | | | | | | | | | This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
* | | Refactor zval cleanup into single functionBob Weinand2016-05-051-1/+1
|/ / | | | | | | Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
* | Revert "Fix bad merge into master"Dmitry Stogov2016-04-291-0/+3
| | | | | | | | This reverts commit 2c8e4ba8f1f63429f5d0e08a4a0fc6d449ca801a.
* | Fix bad merge into masterBob Weinand2016-04-281-3/+0
| | | | | | | | | | This should only have been reverted in 7.0, but not for 7.1. (merge=ours??) Added appropriate NEWS entry.
* | Merge branch 'PHP-7.0'Dmitry Stogov2016-04-281-0/+3
|\ \ | |/ | | | | | | * PHP-7.0: Fixed BC break described by bug #72119. It was introduced after 7.0.5 release by attempt to fix bug #71428.
| * Fixed BC break described by bug #72119.Dmitry Stogov2016-04-281-0/+3
| | | | | | | | It was introduced after 7.0.5 release by attempt to fix bug #71428.
* | Merge branch 'PHP-7.0'Dmitry Stogov2016-04-191-1/+2
|\ \ | |/ | | | | | | * PHP-7.0: Prevent usage in GC after free.
| * Merge branch 'PHP-5.6' into PHP-7.0Dmitry Stogov2016-04-191-1/+2
| | | | | | | | | | * PHP-5.6: Prevent usage in GC after free.
* | Merge branch 'PHP-7.0'Dmitry Stogov2016-04-071-1/+0
|\ \ | |/ | | | | | | * PHP-7.0: Fixed build
| * Fixed buildDmitry Stogov2016-04-071-2/+2
| |
* | Fix the buildKalle Sommer Nielsen2016-04-061-2/+3
| |
* | Merge branch 'PHP-7.0'Dmitry Stogov2016-04-061-12/+26
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
| * Fixed bug #71978 (Existence of return type hint affects other compatibility ↵Dmitry Stogov2016-04-061-12/+26
| | | | | | | | rules)
* | Fixed bug #62814Nikita Popov2016-03-291-9/+9
| |
* | Merge branch 'PHP-7.0'Joe Watkins2016-03-291-3/+3
|\ \ | |/ | | | | | | * PHP-7.0: remove unused param
| * remove unused paramJoe Watkins2016-03-291-3/+3
| |
* | Merge branch 'PHP-7.0'Joe Watkins2016-03-291-0/+2
|\ \ | |/ | | | | | | * PHP-7.0: fix bug #71428: Validation type inheritance with = NULL
| * fix bug #71428: Validation type inheritance with = NULLJoe Watkins2016-03-291-0/+2
| |
* | Merge branch 'PHP-7.0'Joe Watkins2016-03-291-7/+7
|\ \ | |/ | | | | | | * PHP-7.0: Bug #71428 work ... hopefully, fix drupal 8
| * Bug #71428 work ... hopefully, fix drupal 8Joe Watkins2016-03-291-7/+7
| |
* | Merge branch 'PHP-7.0'Joe Watkins2016-03-281-0/+5
|\ \ | |/ | | | | | | * PHP-7.0: work on #71428
| * work on #71428Joe Watkins2016-03-281-0/+5
| |
* | We don't need to dup zend_class_constant here.Xinchen Hui2016-01-221-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quote why the internal class is still using duplication: ``` for internal classes, the zend_class_constant is malloc-ed. we need to free it. if (const->ce == ce) { zval_ptr_dtor(&const->value); free(const) } so, if two classes share one const, and it(parent class) was freed before, this read(in child class, const->ce) is invalid.. and destroy_zend_class is called via zend_hash_destroy(class_table). which is not in reverse order... so, parent classes are dtor first. if we want this work, we should change that order. ```
* | Fixed bug #71413 (Crash with constants on internal interfaces)Xinchen Hui2016-01-211-1/+8
| |
* | Merge branch 'PHP-7.0'Dmitry Stogov2016-01-131-1/+14
|\ \ | |/ | | | | | | | | * PHP-7.0: Fixed bug #71248 (Wrong interface is enforced) Update NEWS
| * Fixed bug #71248 (Wrong interface is enforced)Dmitry Stogov2016-01-131-1/+14
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-01-061-11/+11
|\ \ | |/
| * Fixed bug #71275 (Bad method called on cloning an object having a trait)Bob Weinand2016-01-051-11/+11
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-01-021-1/+1
|\ \ | |/
| * bump year which is missed in rev 49493a2Xinchen Hui2016-01-021-1/+1
| |
* | Merge branch 'PHP-7.0'Julien Pauli2015-12-241-2/+2
|\ \ | |/ | | | | | | * PHP-7.0: Remove mentions of "type hint" and "typehint"
| * Remove mentions of "type hint" and "typehint"Levi Morrison2015-12-241-2/+2
| |
* | Implemented the RFC `Support Class Constant Visibility`.Dmitry Stogov2015-12-081-36/+38
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit f11ca0e7a57793fa0e3e7f6d451720e6c42bb0b9 Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Dec 8 12:38:42 2015 +0300 Fixed test expectation commit 211f873f542504d0a0f72b6b5cb23908a1c99a2d Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Dec 8 12:28:38 2015 +0300 Embed zend_class_constant.flags into zend_class_constants.value.u2.access_flags commit 51deab84b2cdbf9cdb1a838cf33b2ee45c61748b Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Dec 7 11:18:55 2015 +0300 Fixed issues found by Nikita commit 544dbd5b47e40d38a8ccb96bc5583e9cb7fdd723 Author: Dmitry Stogov <dmitry@zend.com> Date: Sat Dec 5 02:41:05 2015 +0300 Refactored immplementation of https://wiki.php.net/rfc/class_const_visibility @reeze created an RFC here and I emailed internals here and didn't get any responses positive/negative.
* Fix bug #62441Nikita Popov2015-08-281-5/+1
| | | | | These checks were introduced by 8646d9afce989718cde927c526684bbbc1c96e97 back when name resolution was working differently.
* Mark error and exception functions as "cold" (Matt's idea)Dmitry Stogov2015-08-191-2/+2
|
* fix inheritance of internal interfaces with constantsMichael Wallner2015-08-181-1/+7
|
* use efree_size hereXinchen Hui2015-08-121-3/+3
|
View Lorry Controller Status