Issue #3382821: Improve patch from issue 3360661

[zanvidmar]

By mistake, patch from issue 3360661 is partly overriding the fix from patch issue 2930457#comment-13973067 which is causing regression fixed by issue 3360661.

Problem

Error: TypeError: count(): Argument # 1 ($value) must be of type Countable|array, bool given in count() (line 132 of /var/www/html/html/modules/contrib/url_embed/src/Plugin/Filter/ConvertUrlToEmbedFilter.php)

Solution

This commit provides an updated version of patch from issue 3360661 by removing the lines that overrides patch from issue 2930457#comment-13973067. I had some challenges with creating interdiiff (Whitespace damage detected in input) and I did this instead: https://www.diffchecker.com/xacR5wZX/. In the interdiff we can see that we are removing the code that is responsible for falsely code removal that was applied by https://www.drupal.org/files/issues/2021-01-22/urlembed-non-embeddable-urls-2761187-opensocial-combined-21.patch

Issue tracker

3382821

Theme issue tracker

N/A

How to test

• HTT 1: Follow the steps to reproduce of https://www.drupal.org/project/social/issues/3360661 and confirm that expected result is provided.
• HTT 2: Follow the steps to reproduce of https://www.drupal.org/project/social/issues/3382821

HTT3:

• Install clean version of Open Social (11.9.x)
• enable social_embed module
• Create a post by visiting post/add/post and insert content: "Broken link example: http://example/idontexist and working Youtube embed example: https://youtu.be/ojafuCcUZzU"
• Go to homepage and you will see WSOD with an error: Embed\Exceptions\InvalidUrlException: Could not resolve host: example in Embed\Embed::process() (line 144 of /var/www/html/vendor/embed/embed/src/Embed.php)..
• The expected result (screenshot) is attained when repeating the steps with this fix applied.

Definition of done

Before merge

• Code/peer review is completed
• All commit messages are clear and clean. If applicable a rebase was performed
• All automated tests are green
• Functional/manual tests of the acceptance criteria are approved
• All acceptance criteria were met
• New features or changes to existing features are covered by tests, either unit (preferably) or behat
• Update path is tested. New hook_updates should respect update order, right naming convention and consider hook_post_update code
• Module can be safely uninstalled. Update/implement hook_uninstall and make sure that removed configuration or dependencies are removed/uninstalled
• This pull request has all required labels (team/type/priority)
• This pull request has a milestone
• This pull request has an assignee (if applicable)
• Any front end changes are tested on all major browsers
• New UI elements, or changes on UI elements are approved by the design team
• New features, or feature changes are approved by the product owner

After merge

• Code is tested on all branches that it has been cherry-picked
• Update hook number might need adjustment, make sure they have the correct order
• The Drupal.org ticket(s) are updated according to this pull request status

Screenshots

Release notes

We resolved the issue that happened when social_embed is enabled and a post with broken url and valid embed url was created.

Change Record

N/A

Translations

N/A

[mergeable]

Thanks for contributing towards Open Social! A maintainer from the @goalgorilla/maintainers group might not review all changes from all teams/contributors. Please don't be discouraged if it takes a while. In the meantime, we have some automated checks running and it might be that you will see our comments with some tips or requests to speed up the review process. 😊

[tbsiqueira]

Chery-picked to 11.9.x and 11.10.x