Skip to content

Fix robots.txt not store specific #29331

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Aug 8, 2020
Merged

Fix robots.txt not store specific #29331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1054ad
fix robots.txt not store specific
engcom-Charlie Jul 30, 2020
2020e98
cover by integration test
engcom-Charlie Aug 6, 2020
1563ef2
fix static
engcom-Charlie Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions app/code/Magento/Sitemap/Block/Robots.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
use Magento\Robots\Model\Config\Value;
use Magento\Sitemap\Helper\Data as SitemapHelper;
use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
use Magento\Sitemap\Model\SitemapConfigReader;
use Magento\Framework\App\ObjectManager;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Store\Model\StoreResolver;

Expand All @@ -29,6 +31,7 @@ class Robots extends AbstractBlock implements IdentityInterface

/**
* @var SitemapHelper
* @deprecated
*/
private $sitemapHelper;

Expand All @@ -37,14 +40,19 @@ class Robots extends AbstractBlock implements IdentityInterface
*/
private $storeManager;

/**
* @var SitemapConfigReader
*/
private $sitemapConfigReader;

/**
* @param Context $context
* @param StoreResolver $storeResolver
* @param CollectionFactory $sitemapCollectionFactory
* @param SitemapHelper $sitemapHelper
* @param StoreManagerInterface $storeManager
* @param array $data
*
* @param SitemapConfigReader|null $sitemapConfigReader
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
Expand All @@ -53,11 +61,14 @@ public function __construct(
CollectionFactory $sitemapCollectionFactory,
SitemapHelper $sitemapHelper,
StoreManagerInterface $storeManager,
array $data = []
array $data = [],
?SitemapConfigReader $sitemapConfigReader = null
) {
$this->sitemapCollectionFactory = $sitemapCollectionFactory;
$this->sitemapHelper = $sitemapHelper;
$this->storeManager = $storeManager;
$this->sitemapConfigReader = $sitemapConfigReader
?: ObjectManager::getInstance()->get(SitemapConfigReader::class);

parent::__construct($context, $data);
}
Expand All @@ -74,22 +85,16 @@ public function __construct(
*/
protected function _toHtml()
{
$defaultStore = $this->storeManager->getDefaultStoreView();

/** @var \Magento\Store\Model\Website $website */
$website = $this->storeManager->getWebsite($defaultStore->getWebsiteId());
$website = $this->storeManager->getWebsite();

$storeIds = [];
foreach ($website->getStoreIds() as $storeId) {
if ((bool)$this->sitemapHelper->getEnableSubmissionRobots($storeId)) {
$storeIds[] = (int)$storeId;
if ((bool) $this->sitemapConfigReader->getEnableSubmissionRobots($storeId)) {
$storeIds[] = (int) $storeId;
}
}

$links = [];
if ($storeIds) {
$links = array_merge($links, $this->getSitemapLinks($storeIds));
}
$links = $storeIds ? $this->getSitemapLinks($storeIds) : [];

return $links ? implode(PHP_EOL, $links) . PHP_EOL : '';
}
Expand All @@ -106,18 +111,12 @@ protected function _toHtml()
*/
protected function getSitemapLinks(array $storeIds)
{
$sitemapLinks = [];

/** @var \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection $collection */
$collection = $this->sitemapCollectionFactory->create();
$collection->addStoreFilter($storeIds);

$sitemapLinks = [];
foreach ($collection as $sitemap) {
/** @var \Magento\Sitemap\Model\Sitemap $sitemap */
$sitemapFilename = $sitemap->getSitemapFilename();
$sitemapPath = $sitemap->getSitemapPath();

$sitemapUrl = $sitemap->getSitemapUrl($sitemapPath, $sitemapFilename);
$sitemapUrl = $sitemap->getSitemapUrl($sitemap->getSitemapPath(), $sitemap->getSitemapFilename());
$sitemapLinks[$sitemapUrl] = 'Sitemap: ' . $sitemapUrl;
}

Expand Down
Loading