Classcollectionloader: fix traits + enhancements #6258
Closed
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
| } | ||
| array_map(function ($class) { return $class->getName(); }, $ordered) | ||
| ); | ||
| } |
There was a problem hiding this comment.
Three lines above seems to be invalid result of rebasing =)
| for ($i = 0, $max = count($tokens); $i < $max; $i++) { | ||
| $token = $tokens[$i]; | ||
| for (reset($tokens); false !== $token = current($tokens); next($tokens)) { | ||
|
|
|
Should be ready. |
|
@fabpot I initially marked this PR for 2.3 but it contains a fix for traits, should you merge it ? |
|
@fabpot could this be in 2.2 ? |
| public function getFixNamespaceDeclarationsData() | ||
| { | ||
| return array( | ||
| public function getFixNamespaceDeclarationsDataWithoutTokenizer() |
|
@fabpot fixed |
fabpot
added a commit
that referenced
this pull request
Feb 1, 2013
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #6258). Commits ------- d4acd6d Classcollectionloader: fix traits + enhancements Discussion ---------- Classcollectionloader: fix traits + enhancements Commits: - some tweaks - generates smaller cache files (20% decrease for the SE) - fix traits dependency - thanks php for consistency https://bugs.php.net/bug.php?id=61554 --------------------------------------------------------------------------- by vicb at 2012-12-11T07:56:07Z @stloyd @fabpot thanks for the useful reviews, everything should be fixed now. --------------------------------------------------------------------------- by vicb at 2012-12-11T10:03:48Z Should be ready. --------------------------------------------------------------------------- by vicb at 2013-01-15T21:05:42Z @fabpot I initially marked this PR for 2.3 but it contains a fix for traits, should you merge it ? --------------------------------------------------------------------------- by vicb at 2013-01-23T20:09:32Z @fabpot could this be in 2.2 ? --------------------------------------------------------------------------- by vicb at 2013-02-01T14:07:08Z @fabpot fixed
|
thanks ! |
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.
Commits: