Commit 190bf5f
committed
Bind trait props/consts before parent class
This more accurately matches the "copy & paste" semantics described in the
documentation. The same could be done for methods. However, abstract trait
methods diverge from this behavior, given that a parent method can satisfy trait
methods used in the child. In that case, the method is not copied, but the check
must be performed after the parent has been bound. For now, just bother with
properties and constants.
Fixes GH-157531 parent fecad54 commit 190bf5f
File tree
3 files changed
+38
-18
lines changed- Zend
- tests/traits
3 files changed
+38
-18
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | 18 | | |
31 | 19 | | |
32 | | - | |
| 20 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2455 | 2455 | | |
2456 | 2456 | | |
2457 | 2457 | | |
2458 | | - | |
| 2458 | + | |
2459 | 2459 | | |
2460 | 2460 | | |
2461 | 2461 | | |
| |||
2465 | 2465 | | |
2466 | 2466 | | |
2467 | 2467 | | |
2468 | | - | |
2469 | | - | |
2470 | | - | |
2471 | | - | |
2472 | 2468 | | |
2473 | 2469 | | |
2474 | 2470 | | |
| |||
2990 | 2986 | | |
2991 | 2987 | | |
2992 | 2988 | | |
| 2989 | + | |
| 2990 | + | |
| 2991 | + | |
| 2992 | + | |
| 2993 | + | |
| 2994 | + | |
2993 | 2995 | | |
2994 | 2996 | | |
2995 | 2997 | | |
| |||
0 commit comments