Skip to content

Github #31984: fix for array offset bug during some 404s (PHP 7.4) #31985

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
Apr 26, 2021
Merged

Github #31984: fix for array offset bug during some 404s (PHP 7.4) #31985

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
6316620
Github #31984: fix for array offset bug during some 404s (PHP 7.4)
erfanimani Feb 8, 2021
6da61df
Github #31984: covered method with unit test
erfanimani Mar 5, 2021
ae62eef
Github #31984: improved unit test from feedback
erfanimani Mar 5, 2021
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
7 changes: 5 additions & 2 deletions app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,16 @@ private function findProductRewriteByRequestPath(array $data): ?array
unset($data[UrlRewrite::IS_AUTOGENERATED]);
$categoryFromDb = $this->connection->fetchRow($this->prepareSelect($data));

if ($categoryFromDb === false) {
return null;
}

if ($categoryFromDb[UrlRewrite::REDIRECT_TYPE]) {
$productFromDb[UrlRewrite::REDIRECT_TYPE] = OptionProvider::PERMANENT;
$categoryPath = str_replace($categorySuffix, '', $categoryFromDb[UrlRewrite::TARGET_PATH]);
}

if ($categoryFromDb === false
|| !$productResource->canBeShowInCategory(
if (!$productResource->canBeShowInCategory(
$productFromDb[UrlRewrite::ENTITY_ID],
$categoryFromDb[UrlRewrite::ENTITY_ID]
)
Expand Down
327 changes: 327 additions & 0 deletions app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DynamicStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,327 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Storage;

use Magento\Catalog\Model\ResourceModel\Product;
use Magento\Catalog\Model\ResourceModel\ProductFactory;
use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
use Magento\CatalogUrlRewrite\Model\Storage\DynamicStorage;
use Magento\Framework\Api\DataObjectHelper;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\ResourceConnection;
use Magento\Framework\DB\Adapter\AdapterInterface;
use Magento\Framework\DB\Select;
use Magento\UrlRewrite\Model\OptionProvider;
use Magento\Store\Model\ScopeInterface;
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use ReflectionMethod;

class DynamicStorageTest extends TestCase
{
/**
* @var DynamicStorage
*/
private $object;

/**
* @var UrlRewriteFactory|MockObject
*/
private $urlRewriteFactoryMock;

/**
* @var DataObjectHelper|MockObject
*/
private $dataObjectHelperMock;

/**
* @var AdapterInterface|MockObject
*/
private $connectionMock;

/**
* @var Select|MockObject
*/
private $selectMock;

/**
* @var ResourceConnection|MockObject
*/
private $resourceConnectionMock;

/**
* @var ScopeConfigInterface|MockObject
*/
private $scopeConfigMock;

/**
* @var Product|MockObject
*/
private $productResourceMock;

/**
* @var ProductFactory|MockObject
*/
private $productFactoryMock;

/**
* @inheritdoc
*/
protected function setUp(): void
{
$this->urlRewriteFactoryMock = $this->getMockBuilder(UrlRewriteFactory::class)
->disableOriginalConstructor()
->getMock();

$this->dataObjectHelperMock = $this->getMockBuilder(DataObjectHelper::class)
->disableOriginalConstructor()
->getMock();

$this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
->disableOriginalConstructor()
->getMock();

$this->selectMock = $this->getMockBuilder(Select::class)
->disableOriginalConstructor()
->getMock();

$this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
->disableOriginalConstructor()
->getMock();

$this->connectionMock
->method('select')
->willReturn($this->selectMock);

$this->resourceConnectionMock
->method('getConnection')
->willReturn($this->connectionMock);

$this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
->getMock();

$this->productResourceMock = $this->getMockBuilder(Product::class)
->disableOriginalConstructor()
->getMock();

$this->productFactoryMock = $this->getMockBuilder(ProductFactory::class)
->disableOriginalConstructor()
->getMock();

$this->productFactoryMock
->method('create')
->willReturn($this->productResourceMock);

$this->object = new DynamicStorage(
$this->urlRewriteFactoryMock,
$this->dataObjectHelperMock,
$this->resourceConnectionMock,
$this->scopeConfigMock,
$this->productFactoryMock
);
}

/**
* @dataProvider findProductRewriteByRequestPathDataProvider
* @param array $data
* @param array|false $productFromDb
* @param string $categorySuffix
* @param array|false $categoryFromDb
* @param bool $canBeShownInCategory
* @param array|null $expectedProductRewrite
* @throws \ReflectionException
*/
public function testFindProductRewriteByRequestPath(
array $data,
$productFromDb,
string $categorySuffix,
$categoryFromDb,
bool $canBeShownInCategory,
?array $expectedProductRewrite
): void {
$this->connectionMock->expects($this->any())
->method('fetchRow')
->will($this->onConsecutiveCalls($productFromDb, $categoryFromDb));

$scopeConfigMap = [
[
CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
ScopeInterface::SCOPE_STORE,
$data['store_id'],
$categorySuffix
]
];

$this->scopeConfigMock
->method('getValue')
->willReturnMap($scopeConfigMap);

$this->productResourceMock
->method('canBeShowInCategory')
->willReturn($canBeShownInCategory);

$method = new ReflectionMethod($this->object, 'findProductRewriteByRequestPath');
$method->setAccessible(true);

$this->assertSame($expectedProductRewrite, $method->invoke($this->object, $data));
}

/**
* @return array
*/
public function findProductRewriteByRequestPathDataProvider(): array
{
return [
[
// Non-existing product
[
'request_path' => 'test.html',
'store_id' => 1
],
false,
'',
null,
true,
null
],
[
// Non-existing category
[
'request_path' => 'a/test.html',
'store_id' => 1
],
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'test.html',
'target_path' => 'catalog/product/view/id/1',
'redirect_type' => '0',
],
'.html',
false,
true,
null
],
[
// Existing category
[
'request_path' => 'shop/test.html',
'store_id' => 1
],
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'test.html',
'target_path' => 'catalog/product/view/id/1',
'redirect_type' => '0',
],
'.html',
[
'entity_type' => 'category',
'entity_id' => '3',
'request_path' => 'shop.html',
'target_path' => 'catalog/category/view/id/3',
'redirect_type' => '0',
],
true,
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'shop/test.html',
'target_path' => 'catalog/product/view/id/1/category/3',
'redirect_type' => '0',
]
],
[
// Existing category, but can't be shown in category
[
'request_path' => 'shop/test.html',
'store_id' => 1
],
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'test.html',
'target_path' => 'catalog/product/view/id/1',
'redirect_type' => '0',
],
'.html',
[
'entity_type' => 'category',
'entity_id' => '3',
'request_path' => 'shop.html',
'target_path' => 'catalog/category/view/id/3',
'redirect_type' => '0',
],
false,
null
],
[
// Existing category, with product 301 redirect type
[
'request_path' => 'shop/test.html',
'store_id' => 1
],
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'test.html',
'target_path' => 'test-new.html',
'redirect_type' => OptionProvider::PERMANENT,
],
'.html',
[
'entity_type' => 'category',
'entity_id' => '3',
'request_path' => 'shop.html',
'target_path' => 'catalog/category/view/id/3',
'redirect_type' => '0',
],
true,
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'shop/test.html',
'target_path' => 'shop/test-new.html',
'redirect_type' => OptionProvider::PERMANENT,
]
],
[
// Existing category, with category 301 redirect type
[
'request_path' => 'shop/test.html',
'store_id' => 1
],
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'test.html',
'target_path' => 'catalog/product/view/id/1',
'redirect_type' => '0',
],
'.html',
[
'entity_type' => 'category',
'entity_id' => '3',
'request_path' => 'shop.html',
'target_path' => 'shop-new.html',
'redirect_type' => OptionProvider::PERMANENT,
],
true,
[
'entity_type' => 'product',
'entity_id' => '1',
'request_path' => 'shop/test.html',
'target_path' => 'shop-new/test.html',
'redirect_type' => OptionProvider::PERMANENT,
]
],
];
}
}