Merge branch 'ACP2E-2770' of https://github.com/adobe-commerce-tier-4/magento2ce into 2.4-develop

Author: thiaramus

app/code/Magento/Catalog/Helper/Product.php

@@ -18,11 +18,13 @@
  */
 class Product extends \Magento\Framework\Url\Helper\Data
 {
-    const XML_PATH_PRODUCT_URL_USE_CATEGORY = 'catalog/seo/product_use_categories';
+    public const XML_PATH_PRODUCT_URL_USE_CATEGORY = 'catalog/seo/product_use_categories';
 
-    const XML_PATH_USE_PRODUCT_CANONICAL_TAG = 'catalog/seo/product_canonical_tag';
+    public const XML_PATH_USE_PRODUCT_CANONICAL_TAG = 'catalog/seo/product_canonical_tag';
 
-    const XML_PATH_AUTO_GENERATE_MASK = 'catalog/fields_masks';
+    public const XML_PATH_AUTO_GENERATE_MASK = 'catalog/fields_masks';
+
+    public const XML_PATH_APPLY_TRANSLITERATION_TO_URL = 'catalog/seo/product_url_transliteration';
 
     /**
      * Flag that shows if Magento has to check product to be saleable (enabled and/or inStock)
@@ -47,8 +49,6 @@ class Product extends \Magento\Framework\Url\Helper\Data
     protected $_assetRepo;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry;
@@ -59,8 +59,6 @@ class Product extends \Magento\Framework\Url\Helper\Data
     protected $_attributeConfig;
 
     /**
-     * Catalog session
-     *
      * @var \Magento\Catalog\Model\Session
      */
     protected $_catalogSession;

app/code/Magento/Catalog/Model/Product/Url.php

@@ -114,7 +114,18 @@ public function getProductUrl($product, $useSid = null)
      */
     public function formatUrlKey($str)
     {
-        return $this->filter->translitUrl($str);
+        if ($this->scopeConfig->getValue(
+            \Magento\Catalog\Helper\Product::XML_PATH_APPLY_TRANSLITERATION_TO_URL,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        )) {
+            return $this->filter->translitUrl($str);
+        } else {
+            $str = preg_replace('/\s+/', '-', $str);
+            $str = mb_strtolower($str);
+            $str = trim($str, '-');
+        }
+
+        return $str;
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Url;
 use Magento\Catalog\Model\Product\Url as ProductUrl;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Filter\FilterManager;
 use Magento\Framework\Session\SidResolverInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -21,6 +22,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class UrlTest extends TestCase
 {
     /**
@@ -53,6 +57,11 @@ class UrlTest extends TestCase
      */
     protected $sidResolver;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private ScopeConfigInterface $scopeConfig;
+
     protected function setUp(): void
     {
         $this->filter = $this->getMockBuilder(
@@ -86,6 +95,8 @@ protected function setUp(): void
         $urlFactory->method('create')
             ->willReturn($this->url);
 
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
             ProductUrl::class,
@@ -95,11 +106,15 @@ protected function setUp(): void
                 'storeManager' => $storeManager,
                 'urlFactory' => $urlFactory,
                 'sidResolver' => $this->sidResolver,
+                'scopeConfig' => $this->scopeConfig
             ]
         );
     }
 
-    public function testFormatUrlKey()
+    /**
+     * @return void
+     */
+    public function testFormatUrlKey(): void
     {
         $strIn = 'Some string';
         $resultString = 'some';
@@ -114,6 +129,29 @@ public function testFormatUrlKey()
             $resultString
         );
 
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Catalog\Helper\Product::XML_PATH_APPLY_TRANSLITERATION_TO_URL,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )->willReturn(true);
+        $this->assertEquals($resultString, $this->model->formatUrlKey($strIn));
+    }
+
+    /**
+     * @return void
+     */
+    public function testFormatUrlKeyWithoutTransliteration(): void
+    {
+        $strIn = 'Some string ';
+        $resultString = 'some-string';
+
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Catalog\Helper\Product::XML_PATH_APPLY_TRANSLITERATION_TO_URL,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )->willReturn(false);
         $this->assertEquals($resultString, $this->model->formatUrlKey($strIn));
     }
 

app/code/Magento/Catalog/etc/adminhtml/system.xml

@@ -116,14 +116,18 @@
             </group>
             <group id="seo" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Search Engine Optimization</label>
-                <field id="title_separator" translate="label" type="text" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="product_url_transliteration" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Apply transliteration for product URL</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="title_separator" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Page Title Separator</label>
                 </field>
-                <field id="category_canonical_tag" translate="label" type="select" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="category_canonical_tag" translate="label" type="select" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Use Canonical Link Meta Tag For Categories</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="product_canonical_tag" translate="label" type="select" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="product_canonical_tag" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Use Canonical Link Meta Tag For Products</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>

app/code/Magento/Catalog/etc/config.xml

@@ -48,6 +48,7 @@
                 <title_separator>-</title_separator>
                 <category_canonical_tag>0</category_canonical_tag>
                 <product_canonical_tag>0</product_canonical_tag>
+                <product_url_transliteration>1</product_url_transliteration>
             </seo>
             <custom_options>
                 <date_fields_order>m,d,y</date_fields_order>

app/code/Magento/Catalog/i18n/en_US.csv

@@ -665,6 +665,7 @@ Comma-separated.,Comma-separated.
 "Page Title Separator","Page Title Separator"
 "Use Canonical Link Meta Tag For Categories","Use Canonical Link Meta Tag For Categories"
 "Use Canonical Link Meta Tag For Products","Use Canonical Link Meta Tag For Products"
+"Apply transliteration for product URL","Apply transliteration for product URL"
 "Catalog Price Scope","Catalog Price Scope"
 "This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"").","This defines the base currency scope (""Currency Setup"" > ""Currency Options"" > ""Base Currency"")."
 "Category Top Navigation","Category Top Navigation"