[ClassLoader] Fix parsing namespace when token_get_all() is missing #16668
Conversation
This file contains hidden or 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
Member
nicolas-grekas
commented
Nov 25, 2015
| Q | A |
|---|---|
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | #14871 |
| License | MIT |
| Doc PR | - |
|
Not bullet proof, but that's not a target (if you want a bullet proof solution, enable token_get_all). |
|
👍 |
1 similar comment
|
👍 |
|
Thank you @nicolas-grekas. |
Tobion
added a commit
that referenced
this pull request
Nov 25, 2015
…s missing (nicolas-grekas) This PR was merged into the 2.3 branch. Discussion ---------- [ClassLoader] Fix parsing namespace when token_get_all() is missing | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14871 | License | MIT | Doc PR | - Commits ------- 4a17c9e [ClassLoader] Fix parsing namespace when token_get_all() is missing
| @@ -137,8 +137,8 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = | |||
| public static function fixNamespaceDeclarations($source) | |||
| { | |||
| if (!function_exists('token_get_all') || !self::$useTokenizer) { | |||
| if (preg_match('/namespace(.*?)\s*;/', $source)) { | |||
| $source = preg_replace('/namespace(.*?)\s*;/', "namespace$1\n{", $source)."}\n"; | |||
| if (preg_match('/(^|\s)namespace(.*?)\s*;/', $source)) { | |||
There was a problem hiding this comment.
Isn't \b in regexes meant for this?
There was a problem hiding this comment.
\b would match e.g. :namespace
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.