Upgraded UDD from version 6.1.0 to version 6.1.3

Author: Pierre-Lannoy

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Compatibility with WordPress 6.3.
 
 ### Changed
+- Upgraded UDD from version 6.1.0 to version 6.1.3: dozens of added and improved detections.
 - The color for `shmop` test in Site Health is now gray to not worry to much about it (was previously orange).
 
 ## [3.4.1] - 2023-03-02

includes/libraries/class-libraries.php

@@ -62,7 +62,7 @@ public static function init() {
 			'name'    => 'Universal Device Detection',
 			'prefix'  => 'UDD',
 			'base'    => PODD_VENDOR_DIR . 'udd/',
-			'version' => '6.1.0',
+			'version' => '6.1.3',
 			// phpcs:ignore
 			'author'  => sprintf( esc_html__( '%s & contributors', 'device-detector' ), 'Matomo Analytics' ),
 			'url'     => 'https://github.com/matomo-org/device-detector',

includes/libraries/udd/DeviceDetector.php

@@ -68,7 +68,7 @@ class DeviceDetector
     /**
      * Current version number of DeviceDetector
      */
-    public const VERSION = '6.1.0';
+    public const VERSION = '6.1.3';
 
     /**
      * Constant used as value for unknown browser / os
@@ -345,9 +345,10 @@ public function skipBotDetection(bool $skip = true): void
     /**
      * Returns if the parsed UA was identified as a Bot
      *
+     * @return bool
+     *
      * @see bots.yml for a list of detected bots
      *
-     * @return bool
      */
     public function isBot(): bool
     {
@@ -421,9 +422,10 @@ public function isMobile(): bool
      * Returns if the parsed UA was identified as desktop device
      * Desktop devices are all devices with an unknown type that are running a desktop os
      *
+     * @return bool
+     *
      * @see OperatingSystem::$desktopOsArray
      *
-     * @return bool
      */
     public function isDesktop(): bool
     {
@@ -480,9 +482,10 @@ public function getClient(string $attr = '')
     /**
      * Returns the device type extracted from the parsed UA
      *
+     * @return int|null
+     *
      * @see AbstractDeviceParser::$deviceTypes for available device types
      *
-     * @return int|null
      */
     public function getDevice(): ?int
     {
@@ -492,9 +495,10 @@ public function getDevice(): ?int
     /**
      * Returns the device type extracted from the parsed UA
      *
+     * @return string
+     *
      * @see AbstractDeviceParser::$deviceTypes for available device types
      *
-     * @return string
      */
     public function getDeviceName(): string
     {
@@ -508,10 +512,10 @@ public function getDeviceName(): string
     /**
      * Returns the device brand extracted from the parsed UA
      *
-     * @see self::$deviceBrand for available device brands
-     *
      * @return string
      *
+     * @see self::$deviceBrand for available device brands
+     *
      * @deprecated since 4.0 - short codes might be removed in next major release
      */
     public function getBrand(): string
@@ -522,9 +526,10 @@ public function getBrand(): string
     /**
      * Returns the full device brand name extracted from the parsed UA
      *
+     * @return string
+     *
      * @see self::$deviceBrand for available device brands
      *
-     * @return string
      */
     public function getBrandName(): string
     {
@@ -624,14 +629,15 @@ public function parse(): void
      * To get fast results from DeviceDetector you need to make your own implementation,
      * that should use one of the caching mechanisms. See README.md for more information.
      *
-     * @internal
-     *
-     * @deprecated
-     *
      * @param string       $ua          UserAgent to parse
      * @param ?ClientHints $clientHints Client Hints to parse
      *
      * @return array
+     *
+     * @deprecated
+     *
+     * @internal
+     *
      */
     public static function getInfoFromUserAgent(string $ua, ?ClientHints $clientHints = null): array
     {
@@ -909,6 +915,15 @@ protected function parseDevice(): void
         $osVersion  = $this->getOsAttribute('version');
         $clientName = $this->getClientAttribute('name');
 
+        /**
+         * if it's fake UA then it's best not to identify it as Apple running Android OS
+         */
+        if ('Android' === $osName && 'Apple' === $this->brand) {
+            $this->device = null;
+            $this->brand  = '';
+            $this->model  = '';
+        }
+
         /**
          * Assume all devices running iOS / Mac OS are from Apple
          */

includes/libraries/udd/Parser/Client/Browser.php

@@ -16,6 +16,7 @@
 use UDD\ClientHints;
 use UDD\Parser\Client\Browser\Engine;
 use UDD\Parser\Client\Hints\BrowserHints;
+use UDD\Yaml\ParserInterface as YamlParser;
 
 /**
  * Class Browser
@@ -268,6 +269,7 @@ class Browser extends AbstractClientParser
         'I4' => 'IceCat',
         'ID' => 'IceDragon',
         'IV' => 'Isivioo',
+        'I8' => 'IVVI Browser',
         'IW' => 'Iceweasel',
         'IN' => 'Inspect Browser',
         'IE' => 'Internet Explorer',
@@ -345,6 +347,7 @@ class Browser extends AbstractClientParser
         'NO' => 'Nokia OSS Browser',
         'NV' => 'Nokia Ovi Browser',
         'NX' => 'Nox Browser',
+        'N1' => 'NOMone VR Browser',
         'NE' => 'NetSurf',
         'NF' => 'NetFront',
         'NL' => 'NetFront Life',
@@ -388,6 +391,7 @@ class Browser extends AbstractClientParser
         'PM' => 'Pale Moon',
         'PY' => 'Polypane',
         'PP' => 'Oppo Browser',
+        'P6' => 'Opus Browser',
         'PR' => 'Palm Pre',
         'PU' => 'Puffin',
         '2P' => 'Puffin Web Browser',
@@ -431,6 +435,7 @@ class Browser extends AbstractClientParser
         'SO' => 'Sogou Mobile Browser',
         'RF' => 'SOTI Surf',
         '2S' => 'Soul Browser',
+        'T0' => 'Soundy Browser',
         'SF' => 'Safari',
         'PV' => 'Safari Technology Preview',
         'S5' => 'Safe Exam Browser',
@@ -517,6 +522,7 @@ class Browser extends AbstractClientParser
         'WE' => 'WebPositive',
         'WF' => 'Waterfox',
         'WB' => 'Wave Browser',
+        'WA' => 'Wavebox',
         'WH' => 'Whale Browser',
         'WO' => 'wOSBrowser',
         'WT' => 'WeTab Browser',
@@ -581,7 +587,7 @@ class Browser extends AbstractClientParser
             'XO', 'U0', 'B0', 'VA', 'X0', 'NX', 'O5', 'R1', 'I1',
             'HO', 'A5', 'X1', '18', 'B5', 'B6', 'TC', 'A6', '2X',
             'F4', 'YG', 'WR', 'NA', 'DM', '1M', 'A7', 'XN', 'XT',
-            'XB', 'W1', 'HT', 'B8', 'F5', 'B9',
+            'XB', 'W1', 'HT', 'B8', 'F5', 'B9', 'WA', 'T0', 'HC',
         ],
         'Firefox'            => [
             'AX', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
@@ -619,7 +625,7 @@ class Browser extends AbstractClientParser
         'O4', 'XO', 'U0', 'B0', 'VA', 'X0', 'A5', 'X1', '18',
         'B5', 'B6', 'TC', 'A6', '2X', 'F4', 'YG', 'WR', 'NA',
         'DM', '1M', 'A7', 'XN', 'XT', 'XB', 'W1', 'HT', 'B7',
-        'B9',
+        'B9', 'T0', 'I8',
     ];
 
     /**
@@ -743,6 +749,17 @@ public static function isMobileOnlyBrowser(string $browser): bool
                 && \in_array(\array_search($browser, self::$availableBrowsers), self::$mobileOnlyBrowsers));
     }
 
+    /**
+     * Sets the YamlParser class
+     *
+     * @param YamlParser $yamlParser
+     */
+    public function setYamlParser(YamlParser $yamlParser): void
+    {
+        parent::setYamlParser($yamlParser);
+        $this->browserHints->setYamlParser($this->getYamlParser());
+    }
+
     /**
      * @inheritdoc
      */

includes/libraries/udd/Parser/Client/MobileApp.php

@@ -15,6 +15,7 @@
 use UDD\Cache\CacheInterface;
 use UDD\ClientHints;
 use UDD\Parser\Client\Hints\AppHints;
+use UDD\Yaml\ParserInterface as YamlParser;
 
 /**
  * Class MobileApp
@@ -83,6 +84,17 @@ public function setCache(CacheInterface $cache): void
         $this->appHints->setCache($cache);
     }
 
+    /**
+     * Sets the YamlParser class
+     *
+     * @param YamlParser $yamlParser
+     */
+    public function setYamlParser(YamlParser $yamlParser): void
+    {
+        parent::setYamlParser($yamlParser);
+        $this->appHints->setYamlParser($this->getYamlParser());
+    }
+
     /**
      * Parses the current UA and checks whether it contains any client information
      * See parent::parse() for more details.