Merge remote-tracking branch 'origin/master' into podcasting_uas

matomo-org · Oct 16, 2023 · e5482b8 · e5482b8
2 parents 92eb7c1 + 5ed382f
commit e5482b8
Show file tree

Hide file tree

Showing 8 changed files with 843 additions and 32 deletions.
diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
@@ -1169,6 +1169,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'PC'  => 'PCD',
         'PD'  => 'PCD Argentina',
         'PE'  => 'PEAQ',
+        'PEN' => 'Penta',
         'PG'  => 'Pentagram',
         'PQ'  => 'Pendoo',
         '93'  => 'Perfeo',
@@ -1399,6 +1400,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '43'  => 'Spectralink',
         'SP'  => 'Spice',
         '84'  => 'Sprint',
+        'SPU' => 'SPURT',
         'QS'  => 'SQOOL',
         'S4'  => 'Star',
         'OL'  => 'Starlight',

diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -3910,3 +3910,19 @@
     version: 5.4.0
     platform: x64
     family: Android
+-
+  user_agent: Aloha/1 CFNetwork/1483 Darwin/23.1.0
+  os:
+    name: iOS
+    short_name: IOS
+    version: "17.1"
+    platform:
+    family: iOS
+-
+  user_agent: Safari/19616.8.27.211.1 CFNetwork/1483 Darwin/23.1.0
+  os:
+    name: Mac
+    short_name: MAC
+    version: "14.1"
+    platform:
+    family: Mac
diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml
@@ -1697,3 +1697,19 @@
     model: Pova Neo 2
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/20G75 Instagram 296.0.0.18.107 (iPhone14,8; iOS 16_6; en_US; en; scale=3.00; 1284x2778; 505423516)
+  os:
+    name: iOS
+    version: "16.6"
+    platform: ""
+  client:
+    type: mobile app
+    name: Instagram App
+    version: 296.0.0.18.107
+  device:
+    type: phablet
+    brand: Apple
+    model: iPhone 14 Plus
+  os_family: iOS
+  browser_family: Unknown