Merge branch 'master' into os

matomo-org · Nov 19, 2024 · f0514db · f0514db
2 parents c24bdfd + f3c7b29
commit f0514db
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -774,11 +774,11 @@ class Browser extends AbstractClientParser
         ],
         'Firefox'            => [
             'FF', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
-            'FB', 'FE', 'AX', 'FM', 'FR', 'FY', 'GZ', 'I4', 'IF',
+            'FB', 'FE', 'AX', 'FM', 'FR', 'FY', 'I4', 'IF', '8P',
             'IW', 'LH', 'LY', 'MB', 'MN', 'MO', 'MY', 'OA', 'OS',
             'PI', 'PX', 'QA', 'S5', 'SX', 'TF', 'TO', 'WF', 'ZV',
             'FP', 'AD', '2I', 'P9', 'KJ', 'WY', 'VK', 'W5',
-            '7C', 'N7', 'W7', '8P',
+            '7C', 'N7', 'W7',
         ],
         'Internet Explorer'  => ['IE', 'CZ', 'BZ', 'IM', 'PS', '3A', '4A', 'RN'],
         'Konqueror'          => ['KO'],

diff --git a/Tests/Parser/Client/BrowserTest.php b/Tests/Parser/Client/BrowserTest.php
@@ -105,6 +105,31 @@ public function testBrowserFamiliesNoDuplicates(): void
         }
     }
 
+    public function testShortCodesComparisonWithBrowsers(): void
+    {
+        $reflectionClass = new \ReflectionClass(Browser::class);
+        $browserProperty = $reflectionClass->getProperty('availableBrowsers');
+        $browserProperty->setAccessible(true);
+        $availableBrowsers = $browserProperty->getValue();
+
+        $browserFamilyProperty = $reflectionClass->getProperty('browserFamilies');
+        $browserFamilyProperty->setAccessible(true);
+        $browserFamilies = $browserFamilyProperty->getValue();
+        $result          = [];
+
+        foreach ($browserFamilies as $codes) {
+            foreach ($codes as $code) {
+                if (isset($availableBrowsers[$code])) {
+                    continue;
+                }
+
+                $result[] = $code;
+            }
+        }
+
+        $this->assertEquals([], $result, 'These shortcode does not match the list of browsers');
+    }
+
     /**
      * @return array
      */