Skip to content
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

Sitemap fix error in case of image with null Title or Caption #37462

Open
wants to merge 8 commits into
base: 2.4-develop
Choose a base branch
from

Conversation

RPrudon
Copy link

@RPrudon RPrudon commented May 4, 2023

Description (*)

This patch fixes Patch to fix Argument 1 passed to Magento\Sitemap\Model\Sitemap::escapeXmlText() must be of the type string, null given when the given title or caption are null.

Manual testing scenarios (*)

  1. Add a sitemap image with a title or caption with the value null.
  2. The Sitemap model should no longer return an error.

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
  • All automated tests passed successfully (all builds are green)

Resolved issues:

  1. resolves [Issue] Sitemap fix error in case of image with null Title or Caption #39410: Sitemap fix error in case of image with null Title or Caption

@m2-assistant
Copy link

m2-assistant bot commented May 4, 2023

Hi @RPrudon. Thank you for your contribution!
Here are some useful tips on how you can test your changes using Magento test environment.

Add the comment under your pull request to deploy test or vanilla Magento instance:
  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names.

Allowed build names are:
  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests
  13. Semantic Version Checker

You can find more information about the builds here
ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.


For more details, review the Code Contributions documentation.
Join Magento Community Engineering Slack and ask your questions in #github channel.

@RPrudon
Copy link
Author

RPrudon commented May 4, 2023

@magento run all tests

@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

@engcom-Bravo engcom-Bravo added the Priority: P2 A defect with this priority could have functionality issues which are not to expectations. label May 4, 2023
@RPrudon
Copy link
Author

RPrudon commented May 25, 2023

@magento run all tests

@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

@engcom-Hotel engcom-Hotel self-requested a review June 6, 2023 10:11
@engcom-Hotel
Copy link
Contributor

@magento run all tests

@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

Copy link
Contributor

@engcom-Hotel engcom-Hotel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @RPrudon,

Thanks for the contribution!

The changes look good to us. Just one thing, please cover this change with some automated tests like unit test.

Thanks

@engcom-Dash
Copy link
Contributor

@magento run all tests

@engcom-Dash
Copy link
Contributor

@magento run all tests

@engcom-Dash
Copy link
Contributor

@magento run all tests

@engcom-Hotel
Copy link
Contributor

@magento run all tests

Copy link
Contributor

@engcom-Hotel engcom-Hotel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @RPrudon @engcom-Dash,

Please refer to my review comments and also please cover the changes with some automated tests.

Thanks

@@ -576,9 +576,9 @@ protected function _getSitemapRow($url, $lastmod = null, $changefreq = null, $pr
foreach ($images->getCollection() as $image) {
$row .= '<image:image>';
$row .= '<image:loc>' . $this->_escaper->escapeUrl($image->getUrl()) . '</image:loc>';
$row .= '<image:title>' . $this->escapeXmlText($images->getTitle()) . '</image:title>';
$row .= '<image:title>' . $this->escapeXmlText((string)$images->getTitle()) . '</image:title>';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be $image instead of $images

Suggested change
$row .= '<image:title>' . $this->escapeXmlText((string)$images->getTitle()) . '</image:title>';
$row .= '<image:title>' . $this->escapeXmlText((string)$image->getTitle()) . '</image:title>';

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@engcom-Hotel, I have analyzed and debugged the code and found that the current implementation is correct. The reason is that $image does not contain any title; the title is associated only with $images. This is why, in the current codebase, it is $images instead of $image. Please have a look at below screenshots:
image
image

Additionally, for the caption, we are already checking if it is null, so IMO, we don't need the typecasting, as the error mentioned is related to null values only.

Since the changes is related to typecasting only and we already have automated tests for this class, could you please review the implementation?

Thanks!

cc: @RPrudon

@engcom-Dash
Copy link
Contributor

@magento create issue

@engcom-Dash
Copy link
Contributor

Hello @RPrudon,

Thanks for the contributions!

The changes look good to me, but could you please provide a scenario where we would encounter the mentioned error in the description? I tried generating the sitemap multiple times, but I didn't encounter any errors. Additionally, you mentioned that this error occurs when we have a null caption, but this scenario is already handled on line 580. If you could provide more details or a specific scenario where these errors occur, it would help us understand the issue more clearly.

Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: ready for testing
Projects
Status: Testing in Progress
Development

Successfully merging this pull request may close these issues.

[Issue] Sitemap fix error in case of image with null Title or Caption
4 participants