Commit 5ea1f21
Ask Composer's autoloaders for the file instead of letting them include it
AutoloadSourceLocator finds which file declares a class by running the
registered autoloaders behind FileReadTrapStreamWrapper, which records the path
an include reached for and serves an empty script in its place. That only
shadows the real file while the compiler asks the wrapper for the contents.
With OPcache already holding the script it does not ask, and the file runs a
second time - fatal for one declaring a function, which is the function-per-file
layout of php-standard-library and azjezz/psl: their files-autoload bootstrap
has already loaded every path their PSR-4 prefix also resolves to.
ClassLoader::findFile() answers with the same path loadClass() would include,
without running anything, so ask it rather than arranging for the include to be
harmless. Nothing is compiled and no cache is consulted, which is what makes
this hold wherever PHP runs.
Autoloaders still run in registration order: every non-Composer one runs inside
the trap as before, one at a time, since an autoloader ahead of Composer's may
claim a name Composer would resolve elsewhere. Running them one at a time also
stops hoa/compiler's autoloader, registered ahead of the analysed project's
loader, from forcing the whole probe down the include path.
findFile() concatenates the mapped prefix with the rest of the name, so its
answer can carry ../ segments and mixed separators, where PHP resolves an
include path before the trap ever sees it. It is resolved here to match, which
locateIdentifier() relies on when it compares the located path against
ReflectionClass::getFileName() to tell two same-named classes in one file apart.
The test drives the real locator in a subprocess under the worker's own OPcache
flags: a name whose PSR-4 prefix resolves to a file the process already ran,
which must not run it again, and one whose file nothing has loaded, which must
still resolve without executing.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>1 parent 395468a commit 5ea1f21
5 files changed
Lines changed: 208 additions & 34 deletions
File tree
- src/Reflection/BetterReflection/SourceLocator
- tests/PHPStan/Reflection/BetterReflection/SourceLocator
- data/opcache-trap
Lines changed: 78 additions & 34 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| 35 | + | |
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
| 39 | + | |
37 | 40 | | |
38 | 41 | | |
39 | 42 | | |
| |||
333 | 336 | | |
334 | 337 | | |
335 | 338 | | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
336 | 344 | | |
337 | 345 | | |
338 | 346 | | |
339 | | - | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
345 | 352 | | |
346 | | - | |
347 | | - | |
348 | | - | |
349 | | - | |
350 | | - | |
351 | | - | |
352 | | - | |
353 | | - | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
354 | 382 | | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
364 | 407 | | |
365 | 408 | | |
366 | | - | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
367 | 412 | | |
368 | 413 | | |
369 | | - | |
370 | | - | |
371 | | - | |
372 | 414 | | |
373 | | - | |
374 | | - | |
| 415 | + | |
| 416 | + | |
375 | 417 | | |
376 | 418 | | |
377 | 419 | | |
378 | 420 | | |
379 | 421 | | |
380 | | - | |
381 | | - | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
382 | 426 | | |
383 | 427 | | |
384 | | - | |
385 | | - | |
386 | | - | |
| 428 | + | |
387 | 429 | | |
| 430 | + | |
| 431 | + | |
388 | 432 | | |
389 | 433 | | |
390 | 434 | | |
| |||
Lines changed: 55 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
7 | 16 | | |
8 | 17 | | |
9 | 18 | | |
| |||
29 | 38 | | |
30 | 39 | | |
31 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
32 | 87 | | |
Lines changed: 13 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
Lines changed: 52 additions & 0 deletions
| 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 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
0 commit comments