Commit 4a092d4
committed
Make lazy hydration pre-8.4-clean, defer closure-bearing state replays, hand out a Closure initializer
Three follow-ups to the lazy-ghost feature:
- Guard the ghost-only helpers (eligibility check, slot-index build,
const-expr gate) behind PHP_VERSION_ID >= 80400; they were dead code on
8.2/8.3 and -Werror builds rejected them. Also narrow the slot count
pass to closure-bearing ids and drop a redundant parameter and a dead
branch left over from the broader eligibility design.
- Closure-bearing __wakeup/__unserialize nodes become ghosts too: their
hook runs at the end of their own initialization instead of in the
global children-first phase-9 sequence. Per-entry validation stays in
phase 9; the deferred state is recorded before any user code can
trigger an initializer, only from entries the eager path would actually
call (first one wins), so mid-call touches on malformed payloads cannot
run hooks the eager path would not have run.
- The initializer stored on ghosts is now a Closure over the context's
private hydrate() method (formerly a public __invoke), so
ReflectionClass::getLazyInitializer() returns a plain Closure, shared
by all ghosts of one call.1 parent 6eea3d3 commit 4a092d4
9 files changed
Lines changed: 521 additions & 101 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
28 | 32 | | |
29 | 33 | | |
30 | | - | |
31 | | - | |
32 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
33 | 37 | | |
34 | 38 | | |
35 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
96 | | - | |
97 | | - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
98 | 99 | | |
99 | 100 | | |
100 | 101 | | |
| |||
109 | 110 | | |
110 | 111 | | |
111 | 112 | | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
118 | 124 | | |
119 | 125 | | |
120 | 126 | | |
| |||
134 | 140 | | |
135 | 141 | | |
136 | 142 | | |
137 | | - | |
138 | | - | |
139 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
140 | 147 | | |
141 | 148 | | |
142 | 149 | | |
| |||
0 commit comments