-
Notifications
You must be signed in to change notification settings - Fork 154
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Proposed fix for #237 #307
Conversation
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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! |
Resubmission of a clean version of #306