cleanup

OpenMage · Oct 27, 2024 · 45100b8 · 45100b8
1 parent 7a2ae70
commit 45100b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php
@@ -1060,26 +1060,19 @@ public function getSlugger(): AsciiSlugger
 
     final public function getSluggerConfig(?string $locale): array
     {
-        $config = [
-            '@'      => 'at',
-            '\u00a9' => 'c',
-            '\u00ae' => 'r',
-            '\u2122' => 'tm'
-        ];
-
-        $config += Mage::helper('catalog/product_url')->getConvertTable();
+        $config = Mage::helper('catalog/product_url')->getConvertTable();
 
         if ($locale) {
             $convertNode = Mage::getConfig()->getNode('default/url/convert/' . $locale);
             if ($convertNode instanceof Mage_Core_Model_Config_Element) {
-                $custom = [];
+                $localeConfig = [];
                 /** @var Mage_Core_Model_Config_Element $node */
                 foreach ($convertNode->children() as $node) {
                     if (property_exists($node, 'from') && property_exists($node, 'to')) {
-                        $custom[(string) $node->from] = (string) $node->to;
+                        $localeConfig[(string) $node->from] = (string) $node->to;
                     }
                 }
-                $config = [$locale => $config + $custom];
+                $config = [$locale => $config + $localeConfig];
             }
         }
 

diff --git a/tests/unit/Mage/Catalog/Model/UrlTest.php b/tests/unit/Mage/Catalog/Model/UrlTest.php
@@ -87,42 +87,36 @@ public function testGetSlugger(): void
     public function testGetSluggerConfig($expectedResult, string $locale): void
     {
         $result = $this->subject->getSluggerConfig($locale);
+
         $this->assertArrayHasKey($locale, $result);
+
         $this->assertArrayHasKey('%', $result[$locale]);
         $this->assertArrayHasKey('&', $result[$locale]);
+
+        $this->assertSame($expectedResult[$locale]['%'], $result[$locale]['%']);
+        $this->assertSame($expectedResult[$locale]['&'], $result[$locale]['&']);
+
         $this->assertSame('at', $result[$locale]['@']);
     }
 
     public function provideGetSluggerConfig(): Generator
     {
         yield 'de_DE' => [
             ['de_DE' => [
-                '@' => 'at',
-                '\u00a9' => 'c',
-                '\u00ae' => 'r',
-                '\u2122' => 'tm',
                 '%' => 'prozent',
                 '&' => 'und',
             ]],
             'de_DE',
         ];
         yield 'en_US' => [
             ['en_US' => [
-                '@' => 'at',
-                '\u00a9' => 'c',
-                '\u00ae' => 'r',
-                '\u2122' => 'tm',
                 '%' => 'percent',
                 '&' => 'and',
             ]],
             'en_US',
         ];
         yield 'fr_FR' => [
             ['fr_FR' => [
-                '@' => 'at',
-                '\u00a9' => 'c',
-                '\u00ae' => 'r',
-                '\u2122' => 'tm',
                 '%' => 'pour cent',
                 '&' => 'et',
             ]],