Improves detection for ARM platform (#7731)

* Remove ARM platform name ref #7729
matomo-org · Jul 5, 2024 · aef8813 · aef8813
1 parent 125b643
commit aef8813
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 61 deletions.
diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php
@@ -686,7 +686,7 @@ protected function parsePlatform(): string
             }
         }
 
-        if ($this->matchUserAgent('arm|.*arm64|aarch64|Apple ?TV|Watch ?OS|Watch1,[12]')) {
+        if ($this->matchUserAgent('arm[ _;)ev]|.*arm$|.*arm64|aarch64|Apple ?TV|Watch ?OS|Watch1,[12]')) {
             return 'ARM';
         }
 

diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -4296,7 +4296,7 @@
     name: Armadillo OS
     short_name: ARM
     version: ""
-    platform: ARM
+    platform: ""
     family: Android
 -
   user_agent: Mozilla/5.0 (Linux; Android 10; Helix Phone) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36

diff --git a/Tests/fixtures/mobile_apps.yml b/Tests/fixtures/mobile_apps.yml
@@ -1742,7 +1742,7 @@
   os_family: Android
   browser_family: Unknown
 -
-  user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SM-G930W8 Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/102.0.5005.125 Mobile Safari/537.36 GoogleApp/13.22.15.26.arm6
+  user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SM-G930W8 Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/102.0.5005.125 Mobile Safari/537.36 GoogleApp/13.22.15.26.arm64
   os:
     name: Android
     version: 8.0.0

diff --git a/Tests/fixtures/smartphone-14.yml b/Tests/fixtures/smartphone-14.yml
@@ -8624,7 +8624,7 @@
   os:
     name: Android
     version: 4.4.4
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-15.yml b/Tests/fixtures/smartphone-15.yml
@@ -4105,7 +4105,7 @@
   os:
     name: Android
     version: "6.0"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4123,7 +4123,7 @@
   os:
     name: Android
     version: "7.0"
-    platform: ARM
+    platform: ""
   client:
     type: mobile app
     name: Facebook
@@ -4139,7 +4139,7 @@
   os:
     name: Android
     version: 8.1.0
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Android Browser
@@ -4157,7 +4157,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4175,7 +4175,7 @@
   os:
     name: Android
     version: 8.1.0
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4193,7 +4193,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4211,7 +4211,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4229,7 +4229,7 @@
   os:
     name: Android
     version: 8.1.0
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4247,7 +4247,7 @@
   os:
     name: Android
     version: 8.1.0
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4265,7 +4265,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4283,7 +4283,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -4301,7 +4301,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-17.yml b/Tests/fixtures/smartphone-17.yml
@@ -3048,7 +3048,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -6642,7 +6642,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -6660,7 +6660,7 @@
   os:
     name: Android
     version: "9"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml
@@ -3298,7 +3298,7 @@
   os:
     name: Android
     version: "7.0"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-20.yml b/Tests/fixtures/smartphone-20.yml
@@ -1722,7 +1722,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -1740,7 +1740,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -1758,7 +1758,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -1776,7 +1776,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -1794,7 +1794,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -1812,7 +1812,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Webview
@@ -1830,7 +1830,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -1848,7 +1848,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml
@@ -8246,7 +8246,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-24.yml b/Tests/fixtures/smartphone-24.yml
@@ -8840,7 +8840,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -8858,7 +8858,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml
@@ -6418,7 +6418,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -6436,7 +6436,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -6760,7 +6760,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: UC Browser Turbo

diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml
@@ -4894,7 +4894,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -5020,7 +5020,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -9156,7 +9156,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -9174,7 +9174,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml
@@ -9254,7 +9254,7 @@
   os:
     name: Android
     version: "10"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile

diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml
@@ -1152,7 +1152,7 @@
   os:
     name: Android
     version: "11"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -5580,7 +5580,7 @@
   os:
     name: Android
     version: "12"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Webview

diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml
@@ -76,7 +76,7 @@
   os:
     name: Android
     version: "12"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile
@@ -9140,7 +9140,7 @@
   os:
     name: Android
     version: "12"
-    platform: ARM
+    platform: ""
   client:
     type: browser
     name: Chrome Mobile