Images in XML sitemap are always linked to base store in multistore on Schedule #19598
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types = 1); | ||
|
|
||
| namespace Magento\Sitemap\Model; | ||
|
|
||
| use Magento\Framework\App\Config\ScopeConfigInterface; | ||
| use Magento\Framework\Translate\Inline\StateInterface; | ||
| use Magento\Framework\Mail\Template\TransportBuilder; | ||
| use Magento\Store\Model\ScopeInterface; | ||
| use Magento\Backend\App\Area\FrontNameResolver; | ||
| use Magento\Sitemap\Model\Observer as Observer; | ||
| use Psr\Log\LoggerInterface; | ||
|
|
||
| /** | ||
| * Sends emails for the scheduled generation of the sitemap file | ||
| */ | ||
| class EmailNotification | ||
| { | ||
| /** | ||
| * @var \Magento\Framework\Translate\Inline\StateInterface | ||
| */ | ||
| private $inlineTranslation; | ||
|
|
||
| /** | ||
| * Core store config | ||
| * | ||
| * @var \Magento\Framework\App\Config\ScopeConfigInterface | ||
Nazar65 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| */ | ||
| private $scopeConfig; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Mail\Template\TransportBuilder | ||
Nazar65 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| */ | ||
| private $transportBuilder; | ||
|
|
||
| /** | ||
| * @var \Psr\Log\LoggerInterface $logger | ||
Nazar65 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| */ | ||
| private $logger; | ||
|
|
||
| /** | ||
| * EmailNotification constructor. | ||
| * @param StateInterface $inlineTranslation | ||
| * @param TransportBuilder $transportBuilder | ||
| * @param ScopeConfigInterface $scopeConfig | ||
| * @param LoggerInterface $logger | ||
| */ | ||
| public function __construct( | ||
| StateInterface $inlineTranslation, | ||
| TransportBuilder $transportBuilder, | ||
| ScopeConfigInterface $scopeConfig, | ||
| LoggerInterface $logger | ||
| ) { | ||
| $this->inlineTranslation = $inlineTranslation; | ||
| $this->scopeConfig = $scopeConfig; | ||
| $this->transportBuilder = $transportBuilder; | ||
| $this->logger = $logger; | ||
| } | ||
|
|
||
| /** | ||
| * Send's error email if sitemap generated with errors. | ||
| * | ||
| * @param array| $errors | ||
Nazar65 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| */ | ||
| public function sendErrors($errors) | ||
Nazar65 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| $this->inlineTranslation->suspend(); | ||
| try { | ||
| $this->transportBuilder->setTemplateIdentifier( | ||
| $this->scopeConfig->getValue( | ||
| Observer::XML_PATH_ERROR_TEMPLATE, | ||
| ScopeInterface::SCOPE_STORE | ||
| ) | ||
| )->setTemplateOptions( | ||
| [ | ||
| 'area' => FrontNameResolver::AREA_CODE, | ||
| 'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID, | ||
| ] | ||
| )->setTemplateVars( | ||
| ['warnings' => join("\n", $errors)] | ||
| )->setFrom( | ||
| $this->scopeConfig->getValue( | ||
| Observer::XML_PATH_ERROR_IDENTITY, | ||
| ScopeInterface::SCOPE_STORE | ||
| ) | ||
| )->addTo( | ||
| $this->scopeConfig->getValue( | ||
| Observer::XML_PATH_ERROR_RECIPIENT, | ||
| ScopeInterface::SCOPE_STORE | ||
| ) | ||
| ); | ||
|
|
||
| $transport = $this->transportBuilder->getTransport(); | ||
| $transport->sendMessage(); | ||
| } catch (\Exception $e) { | ||
| $this->logger->error('Sitemap sendErrors: '.$e->getMessage()); | ||
| } finally { | ||
| $this->inlineTranslation->resume(); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types = 1); | ||
|
|
||
| namespace Magento\Sitemap\Test\Unit\Model; | ||
|
|
||
| use Magento\Backend\App\Area\FrontNameResolver; | ||
| use Magento\Framework\App\Config\ScopeConfigInterface; | ||
| use Magento\Framework\Mail\Template\TransportBuilder; | ||
| use Magento\Framework\Mail\TransportInterface; | ||
| use Magento\Framework\ObjectManagerInterface; | ||
| use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; | ||
| use Magento\Framework\Translate\Inline\StateInterface; | ||
| use Magento\Sitemap\Model\EmailNotification; | ||
| use Magento\Sitemap\Model\Observer; | ||
| use Magento\Store\Model\ScopeInterface; | ||
| use Magento\Store\Model\Store; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| /** | ||
| * Test for Magento\Sitemap\Model\EmailNotification | ||
| */ | ||
| class EmailNotificationTest extends TestCase | ||
| { | ||
| /** | ||
| * @var ObjectManager | ||
| */ | ||
| private $objectManager; | ||
|
|
||
| /** | ||
| * @var EmailNotification | ||
| */ | ||
| private $model; | ||
|
|
||
| /** | ||
| * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $scopeConfigMock; | ||
|
|
||
| /** | ||
| * @var TransportBuilder|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $transportBuilderMock; | ||
|
|
||
| /** | ||
| * @var StateInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $inlineTranslationMock; | ||
|
|
||
| /** | ||
| * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $objectManagerMock; | ||
|
|
||
| protected function setUp() | ||
| { | ||
| $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class) | ||
| ->getMock(); | ||
| $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class) | ||
| ->getMock(); | ||
| $this->transportBuilderMock = $this->getMockBuilder(TransportBuilder::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
| $this->inlineTranslationMock = $this->getMockBuilder(StateInterface::class) | ||
| ->getMock(); | ||
|
|
||
| $this->objectManager = new ObjectManager($this); | ||
| $this->model = $this->objectManager->getObject( | ||
| EmailNotification::class, | ||
| [ | ||
| 'inlineTranslation' => $this->inlineTranslationMock, | ||
| 'scopeConfig' => $this->scopeConfigMock, | ||
| 'transportBuilder' => $this->transportBuilderMock, | ||
| ] | ||
| ); | ||
| } | ||
|
|
||
| public function testSendErrors() | ||
| { | ||
| $exception = 'Sitemap Exception'; | ||
| $transport = $this->createMock(TransportInterface::class); | ||
|
|
||
| $this->scopeConfigMock->expects($this->at(0)) | ||
| ->method('getValue') | ||
| ->with( | ||
| Observer::XML_PATH_ERROR_TEMPLATE, | ||
| ScopeInterface::SCOPE_STORE | ||
| ) | ||
| ->willReturn('[email protected]'); | ||
|
|
||
| $this->inlineTranslationMock->expects($this->once()) | ||
| ->method('suspend'); | ||
|
|
||
| $this->transportBuilderMock->expects($this->once()) | ||
| ->method('setTemplateIdentifier') | ||
| ->will($this->returnSelf()); | ||
|
|
||
| $this->transportBuilderMock->expects($this->once()) | ||
| ->method('setTemplateOptions') | ||
| ->with([ | ||
| 'area' => FrontNameResolver::AREA_CODE, | ||
| 'store' => Store::DEFAULT_STORE_ID, | ||
| ]) | ||
| ->will($this->returnSelf()); | ||
|
|
||
| $this->transportBuilderMock->expects($this->once()) | ||
| ->method('setTemplateVars') | ||
| ->with(['warnings' => $exception]) | ||
| ->will($this->returnSelf()); | ||
|
|
||
| $this->transportBuilderMock->expects($this->once()) | ||
| ->method('setFrom') | ||
| ->will($this->returnSelf()); | ||
|
|
||
| $this->transportBuilderMock->expects($this->once()) | ||
| ->method('addTo') | ||
| ->will($this->returnSelf()); | ||
|
|
||
| $this->transportBuilderMock->expects($this->once()) | ||
| ->method('getTransport') | ||
| ->willReturn($transport); | ||
|
|
||
| $transport->expects($this->once()) | ||
| ->method('sendMessage'); | ||
|
|
||
| $this->inlineTranslationMock->expects($this->once()) | ||
| ->method('resume'); | ||
|
|
||
| $this->model->sendErrors(['Sitemap Exception']); | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.