Proposed fix for #237 #307
Closed
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
|
The build failure is an unrelated composer problem. |
|
I'll have a look at the composer problem. |
|
Hi @Synchro, could you also please add regression tests for this (i.e., unit tests that fail without the fix and that pass with it)? Thanks! |
|
This test works for me - but another started failing. It turned out to be because it contained invalid markup so I fixed that. |
|
@Synchro I've just fixed the Composer-related breakage on master. Could you please rebase, force-push and then comment here? Thanks! |
|
I've rebased, squashed and pushed. |
| 'query' => $mediaQueries['query'][$key], | ||
| ]; | ||
| foreach ($mediaQueries as $query) { | ||
| if (!empty(trim($query[2]))) { |
There was a problem hiding this comment.
You'll need to put trim(...) into a local variable so the empty call also works in PHP 5.4:
https://travis-ci.org/jjriv/emogrifier/jobs/128679215#L181
|
Should work now! |
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.
Resubmission of a clean version of #306