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
Adding support for URL shortener in email 5.x #12128
Adding support for URL shortener in email 5.x #12128
Conversation
* Adding assertions to unit test * Twig template instead of PHP template
Codecov Report
@@ Coverage Diff @@
## 5.x #12128 +/- ##
=========================================
Coverage 58.00% 58.00%
- Complexity 33536 33539 +3
=========================================
Files 2163 2163
Lines 101335 101341 +6
=========================================
+ Hits 58777 58781 +4
- Misses 42558 42560 +2
|
🚀 thanks a lot ! |
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.
I see no issue with these changes. Quite elegant solution 👍
But please fix the CI issues. |
@escopecz I cannot see where the 'CS Fixer' check fails, could you please provide assistance? |
Sure. It's visible when you scroll down that "Some checks were not successful" and you can click on details to see what's failed. Here is the direct link: https://github.com/mautic/mautic/actions/runs/4610697990/jobs/8305732563?pr=12128 |
Thanks @escopecz , I already managed to go that far :) I just can't see what causes the issue, or, more generally, what is the issue, or where to start bug hunting. |
I can help with that. The CS fixer makes sure that the code style is the same across the code base. We configured it to be very similar to what Symfony code style is plus some additional rules. The output shows you lines of code. If the line starts with But the CI job also shows what command it runs on the first line. You can run it on your local like this:
and it will fix the code style issues for you. Then you just review it and push it. |
Hmmm it seems CS Fixer is complaining about code I never edited... EDIT: And now, all checks pass 😅 |
Hey there, is there any chance to get this PR merged soon? Is there anything I can help with? |
@christian-krieg it needs to be tested and approved by a second person. Do you think you can do that? |
Of course I tested before submitting, and I successfully have been using this feature for months now. However, I am not sure if it complies with the intended four-eyes principle if I am the one who tests and approves. But of course, I am willing to do so. |
@escopecz once If ready you can merge it and I will update my PR But I see one issue. After this PR we will have a switch button for shortener URLs for emails, but on SMS it's automatically enabled. Probably we should have a switch button also for SMS. But in the end I can add it in my PR and cleanup |
Probably we should add it for all available channels then? By the way, in my opinion it makes sense to auto-enable it for SMS, since the tracking links are ultra-long, likely to span multiple messages. |
Ok. I'll wait for the second approval |
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.
Works well as discribed in PR #12111.
@christian-krieg please resolve the conflict |
@escopecz The "Mark as resolved" button is grayed out; It seems that I am not able to do this. |
It's better to do this on your local by either rebasing to the fresh 5.x branch or merging it. Rebase is a cleaner way if there are not many conflicts. Let me know if you need more details on how to do this. |
@christian-krieg could you please resolve the conflict so this PR could be merged? It's also blocking #12299 which needs to go into 5.0.0-beta so it must get in within a week or so. |
This pull request has been mentioned on Mautic Forums. There might be relevant details there: https://forum.mautic.org/t/mautic-5-beyond-expectations-beyond-limits/30459/1 |
This PR migrates PR #12111 from 4.x to 5.x. Compared to #12111, this PR adds:
Please note that CS Fixer introduced whitespace in some files in order to align assignment characters ('=', '=>'), so the committed changes are distorted (compared to the functional changes).
Description:
Steps to test this PR: