Merge remote-tracking branch 'engcom/graphql-develop-prs' into graphql-develop-prs

Author: naydav

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php

@@ -194,7 +194,6 @@ protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
                 break;
             default:
                 return false;
-                break;
         }
 
         $attribute = $this->_getAttribute($attributeCode);
@@ -310,10 +309,6 @@ public function getCollection($storeId)
         }
 
         $connection = $this->getConnection();
-        $urlsConfigCondition = '';
-        if ($this->isCategoryProductURLsConfig($storeId)) {
-            $urlsConfigCondition = 'NOT ';
-        }
 
         $this->_select = $connection->select()->from(
             ['e' => $this->getMainTable()],
@@ -324,9 +319,7 @@ public function getCollection($storeId)
             []
         )->joinLeft(
             ['url_rewrite' => $this->getTable('url_rewrite')],
-            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 '
-            . 'AND NULLIF(url_rewrite.metadata,"") IS '
-            . $urlsConfigCondition . 'NULL'
+            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS NULL'
             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),
             ['url' => 'request_path']
@@ -490,20 +483,4 @@ private function getProductImageUrl($image)
     {
         return $this->imageUrlBuilder->getUrl($image, 'product_page_image_large');
     }
-
-    /**
-     * Return Use Categories Path for Product URLs config value
-     *
-     * @param null|string $storeId
-     *
-     * @return bool
-     */
-    private function isCategoryProductURLsConfig($storeId)
-    {
-        return $this->scopeConfig->isSetFlag(
-            HelperProduct::XML_PATH_PRODUCT_URL_USE_CATEGORY,
-            ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php

@@ -15,6 +15,9 @@
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Bundle product view test
+ */
 class BundleProductViewTest extends GraphQlAbstract
 {
     const KEY_PRICE_TYPE_FIXED = 'FIXED';

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php

@@ -21,7 +21,6 @@
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
-//$productRepository->deleteById('p002');
 $product = $productRepository->get('p002', false, null, true);
 $productRepository->delete($product);