summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
Commit message (Collapse)AuthorAgeFilesLines
* Separate common code abd eliminate useless checksDmitry Stogov2019-06-271-76/+48
|
* Inline hot pathDmitry Stogov2019-06-271-23/+38
|
* Avoid double checks on early bindingDmitry Stogov2019-06-271-42/+114
|
* Private methods don't have to be duplicatedDmitry Stogov2019-06-261-1/+2
|
* Reorder conditions to minimize number of checks on fast pathDmitry Stogov2019-06-261-16/+30
|
* Remove always true/false conditions, remove dead conde and simplify code.Dmitry Stogov2019-06-261-47/+42
|
* Replace previosly checked conditions by ZEND_ASSERT()Dmitry Stogov2019-06-251-7/+3
|
* Fixed variance check for abstract constructor during erlay bindingDmitry Stogov2019-06-251-2/+12
|
* CleanupDmitry Stogov2019-06-251-45/+33
|
* Prevent useless hash lookupsDmitry Stogov2019-06-251-5/+8
|
* Keep lowercased parent class name as second argument of DECLARE_CLASS to ↵Dmitry Stogov2019-06-251-2/+2
| | | | avoid extra work at run-time
* Fixed bug 78175 (Preloading must store default values of static variables ↵Dmitry Stogov2019-06-241-1/+1
| | | | and properties)
* Support full variance if autoloading is usedNikita Popov2019-06-111-52/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of delayed variance obligations and check them after linking a class is otherwise finished. Obligations may either be unresolved method compatibility (because the necessecary classes aren't available yet) or open parent/interface dependencies. The latter occur because we allow the use of not fully linked classes as parents/interfaces now. An important aspect of the implementation is we do not require classes involved in variance checks to be fully linked in order for the class to be fully linked. Because the involved types do have to exist in the class table (as partially linked classes) and we do check these for correct variance, we have the guarantee that either those classes will successfully link lateron or generate an error, but there is no way to actually use them until that point and as such no possibility of violating the variance contract. This is important because it ensures that a class declaration always either errors or will produce an immediately usable class afterwards -- there are no cases where the finalization of the class declaration has to be delayed until a later time, as earlier variants of this patch did. Because variance checks deal with classes in various stages of linking, we need to use a special instanceof implementation that supports this, and also introduce finer-grained flags that tell us which parts have been linked already and which haven't. Class autoloading for variance checks is delayed into a separate stage after the class is otherwise linked and before delayed variance obligations are processed. This separation is needed to handle cases like A extends B extends C, where B is the autoload root, but C is required to check variance. This could end up loading C while the class structure of B is in an inconsistent state.
* Register class before fetching parentNikita Popov2019-06-111-2/+3
| | | | | We want the class declaration to be available while compiling the parent class.
* Accept flags argument in zend_lookup_class_ex()Nikita Popov2019-05-271-1/+1
| | | | Instead of a single boolean, so we have space for extension here.
* Implement basic variance supportNikita Popov2019-05-241-74/+131
| | | | | | | This is a minimal variance implementation: It does not support any cyclic type dependencies. Additionally the preloading requirements are much more restrictive than necessary. Hopefully we can relax these in the future.
* Avoid early-binding on unresolved typesNikita Popov2019-05-241-42/+119
| | | | | | Fixes bug #76451, and more importantly lays necessary groundwork for covariant/contravariant types. Bug #76451 is just an edge case, but once covariance is introduced this will become a common problem instead.
* Forbid use of not fully linked classesNikita Popov2019-05-231-1/+3
|
* Refactor inheritance type check implementationNikita Popov2019-05-081-48/+24
| | | | | Extract the self/parent name resolution code and drop unnecessary string copies/releases. Store the fe/proto types in local variables.
* Deduplicate inheritance type check implementationNikita Popov2019-05-081-33/+16
| | | | | | | | Make the check covariant (insofar as it is allowed now, i.e. nullability and iterable) and call it with appropriate argument order for both parameter and return types. This makes it simpler to extend to full variance support.
* Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-05-081-2/+2
|\
| * Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-05-081-2/+2
| |\
| | * Fix resolution of "parent" during inheritance checkNikita Popov2019-05-081-2/+2
| | | | | | | | | | | | | | | We can't assume that the method we're checking against is part of the parent class...
| * | Fixed bug #77498Nikita Popov2019-01-251-0/+3
| | | | | | | | | | | | | | | I've renamed the function to the same name as the exported symbol in master.
* | | Treat abstract ctors the same, regardless of originNikita Popov2019-03-271-4/+4
| | | | | | | | | | | | | | | | | | | | | Abstract ctor signatures should always be respected by all children, independently of whether it comes from an interface or an abstract class. Previously abstract ctor signatures (if they didn't come from an interface) were only checked to one level of inheritance.
* | | Fix lineno for more inheritance errorsNikita Popov2019-03-271-7/+20
| | | | | | | | | | | | And also include explicit linenos in tests.
* | | Make line numbers for inheritance errors more preciseNikita Popov2019-03-271-1/+4
| | | | | | | | | | | | | | | Use the line of the conflicting child method, rather than either the first or last line of the class.
* | | Fix typos in code comments in Zend/ [skip ci]Tyson Andre2019-02-181-1/+1
| | |
* | | Avoid uninitialized entries in properties_info_tableNikita Popov2019-02-151-4/+7
| | | | | | | | | | | | Also don't place it into xlat, there's only ever one user.
* | | Assign (un)serialize_func during compilationNikita Popov2019-02-151-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids writing this cache at runtime, which is illegal if preloading is used. Not every serialize/unserialize function actually belongs to the Serializable interface, but I think it's not a problem to assign these anyway -- whether they are used ultimately depends on whether Serializable is implemented. Alternatively it might make sense to just drop these entirely. I don't think this is performance critical functionality.
* | | Fixed bug #77613 (method visibility change) (reverted ZEND_ACC_CTOR and ↵Dmitry Stogov2019-02-141-4/+5
| | | | | | | | | | | | ZEND_ACC_DTOR flags removal)
* | | Fix refcounting of prop types coming from traitsNikita Popov2019-02-081-0/+3
| | |
* | | Remove local variablesPeter Kokot2019-02-031-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
* | | Adios, yearly copyright rangesZeev Suraski2019-01-301-1/+1
| | |
* | | Implement typed propertiesNikita Popov2019-01-111-5/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC: https://wiki.php.net/rfc/typed_properties_v2 This is a squash of PR #3734, which is a squash of PR #3313. Co-authored-by: Bob Weinand <bobwei9@hotmail.com> Co-authored-by: Joe Watkins <krakjoe@php.net> Co-authored-by: Dmitry Stogov <dmitry@zend.com>
* | | Replace zend_hash_apply... with ZEND_HASH_FOREACH...Dmitry Stogov2018-12-191-3/+1
| | |
* | | Merge branch 'PHP-7.3'Christoph M. Becker2018-12-161-11/+11
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #77291: magic methods inherited from a trait may be ignored
| * | Fix #77291: magic methods inherited from a trait may be ignoredChristoph M. Becker2018-12-161-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding methods from a trait, we must not assume that a method name with the same length as the name of the using class is either a PHP 4 style constructor, or not a magic method at all – it may well be another magic method. We mostly preserve the spirit of the optimization which caused this regression, and avoid string comparisons for all method names which can never be magic methods.
| * | Future-proof email addressesZeev Suraski2018-11-011-2/+2
| | |
* | | Fixed issues related to optimization and persitence of classes linked with ↵Dmitry Stogov2018-11-141-0/+1
| | | | | | | | | | | | interfaces, traits or internal classes.
* | | Update email addresses. We're still @Zend, but future proofing it...Zeev Suraski2018-11-011-2/+2
| | |
* | | Call function_add_ref() in proper placeDmitry Stogov2018-10-301-4/+1
| | |
* | | Don't initialize static_member_tables during start-up, when inherit internal ↵Dmitry Stogov2018-10-191-4/+7
| | | | | | | | | | | | classes.
* | | Immutable clases and op_arrays.Dmitry Stogov2018-10-171-32/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit cd0c36c3f943849e5b97a8dbe2dd029fbeab3df9 Merge: 4740dabb84 ad6738e886 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 14:43:38 2018 +0300 Merge branch 'master' into immutable * master: Remove the "auto" encoding Fixed bug #77025 Add vtbls for EUC-TW encoding commit 4740dabb843c6d4f7f866b4a2456073c9eaf4c77 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 14:12:28 2018 +0300 Reverted back ce->iterator_funcs_ptr. Initialize ce->iterator_funcs_ptr fields in immutable classes. commit ad7a78b253be970db70c2251e66f9297d8e7f829 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:46:30 2018 +0300 Added comment commit 0276ea51875bab37be01a4dc5e5a047c5698c571 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:42:43 2018 +0300 Added type cast commit c63fc5d5f19c58498108d1698055b2b442227eb3 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:36:51 2018 +0300 Moved static class members initialization into the proper place. commit b945548e9306b1826c881918858b5e5aa3eb3002 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:21:03 2018 +0300 Removed redundand assertion commit d5a41088401814c829847db212488f8aae39bcd2 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:19:13 2018 +0300 Removed duplicate code commit 8dadca8864e66de70a24bdf1181bcf7dd8fb27d7 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:05:43 2018 +0300 Hide offset encoding magic in ZEND_MAP_PTR_IS_OFFSET(), ZEND_MAP_PTR_OFFSET2PTR() and ZEND_MAP_PTR_PTR2OFFSET() macros. commit 9ef07c88bd76801e2d4fbfeab3ebfd6e6a67ac5f Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 10:48:29 2018 +0300 typo commit a06f0f3d3aba53e766046221ee44fb9720389ecc Merge: 94099586ec 3412345ffe Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 10:47:07 2018 +0300 Merge branch 'master' into immutable * master: Remove unused variable makefile_am_files Classify object handlers are required/optional Add support for getting SKIP_TAGSTART and SKIP_WHITE options Remove some obsolete config_vars.mk occurrences Remove bsd_converted from .gitignore Remove configuration parser and scanners ignores Remove obsolete buildconf.stamp from .gitignore [ci skip] Add magicdata.patch exception to .gitignore Remove outdated ext/spl/examples items from .gitignore Remove unused test.inc in ext/iconv/tests commit 94099586ec599117581ca01c15b1f6c5f749e23a Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Oct 15 23:34:01 2018 +0300 Immutable clases and op_arrays
* | | Removed wrong reference countingDmitry Stogov2018-10-031-3/+0
| | |
* | | More careful handling of function prototypesDmitry Stogov2018-10-031-31/+39
| | |
* | | typoDmitry Stogov2018-10-031-1/+1
| | |
* | | Avoid method compatibility check with itselfDmitry Stogov2018-10-031-0/+5
| | |
* | | Allocate only necessary space for static properties of internal classes in ↵Dmitry Stogov2018-10-011-0/+10
| | | | | | | | | | | | ZTS mode.
* | | Drop unused variableDmitry Stogov2018-09-191-1/+0
| | |
View Lorry Controller Status