[ClassLoader] Fix ClassCollectionLoader inlining with declare(strict_types=1) #19859
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicolas-grekas
force-pushed
the
class-strict
branch
6 times, most recently
from
92b73f3
to
466de62
Compare
|
So, basically, you prevent files with strict types to be inlined (via a require), is that correct? |
nicolas-grekas
force-pushed
the
class-strict
branch
from
466de62
to
647b3d2
Compare
|
I "inline" them by doing a straight "require" yes. We can't exclude them, because they might be parent classes of non strict classes. |
| throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir)); | ||
| } | ||
| $cacheDir = rtrim(realpath($cacheDir), '/'.DIRECTORY_SEPARATOR); | ||
| $cache = $cacheDir.DIRECTORY_SEPARATOR.$name.$extension; |
There was a problem hiding this comment.
This whole section does not look related to the fix.
There was a problem hiding this comment.
It is: these are some lines moved from the bottom to the before the below loop.
https://github.com/symfony/symfony/pull/19859/files?w=1
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Sep 6, 2016
…are(strict_types=1) (nicolas-grekas) This PR was merged into the 2.7 branch. Discussion ---------- [ClassLoader] Fix ClassCollectionLoader inlining with declare(strict_types=1) | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | Tests pass? | yes | Fixed tickets | #19845 | License | MIT See diff as https://github.com/symfony/symfony/pull/19859/files?w=1 Commits ------- 647b3d2 [ClassLoader] Fix ClassCollectionLoader inlining with declare(strict_types=1)
Merged
nicolas-grekas
added a commit
that referenced
this pull request
Nov 15, 2016
…lt_compiler (giosh94mhz) This PR was squashed before being merged into the 2.7 branch (closes #20455). Discussion ---------- [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler | Q | A | ------------- | --- | Branch? | 2.7+ | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | | License | MIT | Doc PR | | I have some PHP classes which ends with an `__halt_compiler` call which fail on production. This is due to the ClassCollectionLoader inlining the class code (which is followed by random binary data) which breaks PHP parsing of the following classes. I found this issue while using ZendGuardLoader module, but this apply to whatever php class using this function call. I've made my fix, based on #19859, and tested it with symfony 2.7 and 2.8 Commits ------- a60cd15 [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See diff as https://github.com/symfony/symfony/pull/19859/files?w=1