Refactored the doctrine_pretty_query filter to support "highlight only" mode #477
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
javiereguiluz
force-pushed
the
fix_469
branch
from
cdb6b5a to
8da6f54
Compare
|
@javiereguiluz please clean your branch from all these merge commits. It looks like your local master branch diverged form the upstream one. |
|
ok, diff got lost now |
javiereguiluz
force-pushed
the
fix_469
branch
from
1eaee71 to
953ec23
Compare
|
The PR is now ready to be reviewed. Thanks. |
| } else { | ||
| $html = \SqlFormatter::format($sql); | ||
| } | ||
|
|
||
| $html = preg_replace('/<pre class="(.*)">([^"]*+)<\/pre>/Us', '<div class="\1"><pre>\2</pre></div>', $html); |
There was a problem hiding this comment.
this could be simplified, by changing SqlFormatter::$use_pre instead
There was a problem hiding this comment.
and when highlighting only, should we really return a <pre> tag ?
There was a problem hiding this comment.
We can't use $use_pre because is a "global state" and we need to output different things depending whther we highlight or not. I've just updated the code.
guilhermeblanco
added a commit
that referenced
this pull request
Nov 4, 2015
Refactored the doctrine_pretty_query filter to support "highlight only" mode
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.
This fixes #469