Merge branch 'master' into 7967

matomo-org · Jan 8, 2025 · c901e08 · c901e08
2 parents 1bdc165 + 074bf30
commit c901e08
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -7,11 +7,11 @@ DeviceDetector
 
 ## Code Status
 
-![PHPUnit](https://github.com/matomo-org/device-detector/workflows/PHPUnit/badge.svg?branch=master)
-![PHPStan](https://github.com/matomo-org/device-detector/workflows/PHPStan%20check/badge.svg?branch=master)
-![PHPCS](https://github.com/matomo-org/device-detector/workflows/PHPCS%20check/badge.svg?branch=master)
-![YAML Lint](https://github.com/matomo-org/device-detector/workflows/YAML%20Lint/badge.svg?branch=master)
-[![Validate regular Expressions](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml/badge.svg)](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml)
+[![PHPUnit](https://github.com/matomo-org/device-detector/actions/workflows/phpunit.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/phpunit.yml?branch=master "PHPUnit")
+[![PHPStan](https://github.com/matomo-org/device-detector/actions/workflows/phpstan.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/phpstan.yml?branch=master "PHPStan")
+[![PHPCS](https://github.com/matomo-org/device-detector/actions/workflows/phpcs.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/phpcs.yml?branch=master "PHPCS")
+[![YAML Lint](https://github.com/matomo-org/device-detector/actions/workflows/yamllint.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/yamllint.yml?branch=master "YAML Lint")
+[![Validate regular Expressions](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml?branch=master "Validate regular Expressions")
 
 [![Average time to resolve an issue](https://www.isitmaintained.com/badge/resolution/matomo-org/device-detector.svg)](https://www.isitmaintained.com/project/matomo-org/device-detector "Average time to resolve an issue")
 [![Percentage of issues still open](https://www.isitmaintained.com/badge/open/matomo-org/device-detector.svg)](https://www.isitmaintained.com/project/matomo-org/device-detector "Percentage of issues still open")

diff --git a/Tests/Parser/Client/fixtures/mobile_app.yml b/Tests/Parser/Client/fixtures/mobile_app.yml
@@ -2315,3 +2315,9 @@
     type: mobile app
     name: Edmodo
     version: 10.43.5
+-
+  user_agent: HFEducationIOS/1.0.6+g5a01fc39-dirty (iOS; 18.1.1; iPad13,18)
+  client:
+    type: mobile app
+    name: HeartFocus Education
+    version: 1.0.6
diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -5869,3 +5869,11 @@
     version: "5"
     platform: ""
     family: Android
+-
+  user_agent: ArcMobile2/56955.2 CFNetwork/3826.400.101 Darwin/24.3.0
+  os:
+    name: iOS
+    short_name: IOS
+    version: "18.3"
+    platform: ""
+    family: iOS
diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml
@@ -2628,6 +2628,11 @@
   name: 'Edmodo'
   version: '$1'
 
+# HeartFocus Education (https://apps.apple.com/us/app/heartfocus-education/id6618151502)
+- regex: 'HFEducationIOS/([\d.]+)'
+  name: 'HeartFocus Education'
+  version: '$1'
+
 # Electron generic apps
 - regex: ' (?!(?:AppleWebKit|brave|Cypress|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|Dezor|TweakStyle|Colibri|Polypane|Singlebox|Skye|VibeMate|(?:d|LT|Glass|Sushi|Flash|OhHai)Browser|Sizzy))([a-z0-9]*)(?:-desktop|-electron-app)?/(\d+\.[\d.]+).*Electron/'
   name: '$1'

diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml
@@ -1253,6 +1253,7 @@ Xiaomi:
 # Unknown
 Unknown:
   regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});|LaTivu_(?:\d+[.\d]+)_([0-9]{4})'
+  device: 'tv'
   models:
     - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
       model: 'Smart TV ($1)'

diff --git a/regexes/oss.yml b/regexes/oss.yml
@@ -1360,6 +1360,8 @@
 - regex: '^(?!com\.apple\.Safari\.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
   name: 'iOS'
   versions:
+    - regex: 'Darwin/24\.3\.0'
+      version: '18.3'
     - regex: 'Darwin/24\.2\.0'
       version: '18.2'
     - regex: 'Darwin/24\.1\.0'
@@ -1591,6 +1593,8 @@
 - regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d.]+)|C?Python.*Darwin|PowerMac|com\.apple\.Safari\.SearchHelper|^Safari'
   name: 'Mac'
   versions:
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.3\.0'
+      version: '15.3'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.2\.0'
       version: '15.2'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.1\.0'