From 50d8546617115c3daedeff78af318849acb9c1cf Mon Sep 17 00:00:00 2001 From: Atish Goswami Date: Sat, 4 May 2019 11:39:47 +0530 Subject: [PATCH 1/2] Adds fixes for issue #13227 --- app/code/Magento/Catalog/Model/Product/Url.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php index f3ac9f55d1aea..2760b0f9fddb6 100644 --- a/app/code/Magento/Catalog/Model/Product/Url.php +++ b/app/code/Magento/Catalog/Model/Product/Url.php @@ -162,11 +162,8 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = []) \Magento\Store\Model\ScopeInterface::SCOPE_STORE ); - if ($categoryId) { - $filterData[UrlRewrite::METADATA]['category_id'] = $categoryId; - } elseif (!$useCategories) { - $filterData[UrlRewrite::METADATA]['category_id'] = ''; - } + $filterData[UrlRewrite::METADATA]['category_id'] + = $categoryId && $useCategories ? $categoryId : ''; $rewrite = $this->urlFinder->findOneByData($filterData); From d254b9f1b8bd4ae557d0dc2308aa9f79af96289b Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky Date: Wed, 19 Jun 2019 13:34:24 +0300 Subject: [PATCH 2/2] magento/magento2#22650: Integration test fix. --- .../Magento/CatalogImportExport/Model/Import/ProductTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php index 41cd85e6ec2f6..b04d1394e5c12 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php @@ -20,12 +20,12 @@ use Magento\Framework\App\Bootstrap; use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\App\ObjectManager; +use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Filesystem; use Magento\Framework\Registry; use Magento\ImportExport\Model\Import; use Magento\Store\Model\Store; use Psr\Log\LoggerInterface; -use Magento\Framework\Exception\NoSuchEntityException; /** * Class ProductTest @@ -95,6 +95,7 @@ protected function tearDown() try { $product = $productRepository->get($productSku, false, null, true); $productRepository->delete($product); + // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock } catch (NoSuchEntityException $e) { // nothing to delete } @@ -1097,6 +1098,7 @@ public function testProductsWithMultipleStores() /** * Test url keys properly generated in multistores environment. * + * @magentoConfigFixture current_store catalog/seo/product_use_categories 1 * @magentoDataFixture Magento/Store/_files/core_fixturestore.php * @magentoDataFixture Magento/Catalog/_files/category_with_two_stores.php * @magentoDbIsolation enabled