Improves detect desktop and detect devices for brand: Dell

DeviceDetector.php

@@ -741,6 +741,18 @@ protected function hasAndroidMobileFragment(): bool
         return !!$this->matchUserAgent($regex);
     }
 
+    /**
+     * Returns if the parsed UA contains the 'Android; Mobile;' fragment
+     *
+     * @return bool
+     */
+    protected function hasDesktopFragment(): bool
+    {
+        $regex = 'Desktop x(32|64);';
+
+        return !!$this->matchUserAgent($regex);
+    }
+
     /**
      * Returns if the parsed UA contains usage of a mobile only browser
      *
@@ -943,6 +955,17 @@ protected function parseDevice(): void
             $this->device = AbstractDeviceParser::DEVICE_TYPE_TV;
         }
 
+        /**
+         * Set device type desktop if string ua contains desktop
+         */
+        $hasDesktop = AbstractDeviceParser::DEVICE_TYPE_DESKTOP !== $this->device
+            && false !== \strpos($this->userAgent, 'Desktop')
+            && $this->hasDesktopFragment();
+
+        if ($hasDesktop) {
+            $this->device = AbstractDeviceParser::DEVICE_TYPE_DESKTOP;
+        }
+
         // set device type to desktop for all devices running a desktop os that were not detected as another device type
         if (null !== $this->device || !$this->isDesktop()) {
             return;

Tests/fixtures/desktop.yml

@@ -7264,3 +7264,35 @@
     model: BilimBook Mini
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Microsoft Office OneNote/16.0.13328.20478 (Windows/10.0; Desktop x64; en-GB; Universal app; Dell Inc./XPS 13 9360)
+  os:
+    name: Windows
+    version: "10.0"
+    platform: x64
+  client:
+    type: mobile app
+    name: Microsoft Office OneNote
+    version: 16.0.13328.20478
+  device:
+    type: desktop
+    brand: Dell
+    model: XPS 13 9360
+  os_family: Windows
+  browser_family: Unknown
+-
+  user_agent: Microsoft Office OneNote/16.0.13328.20478 (Windows/10.0; Desktop x64; en-GB; Universal app; Dell Inc./XXX TEST)
+  os:
+    name: Windows
+    version: "10.0"
+    platform: x64
+  client:
+    type: mobile app
+    name: Microsoft Office OneNote
+    version: 16.0.13328.20478
+  device:
+    type: desktop
+    brand: Dell
+    model: ""
+  os_family: Windows
+  browser_family: Unknown

regexes/device/mobiles.yml

@@ -4550,6 +4550,9 @@ Dell:
     - regex: '(?:Dell )?(Streak|Venue) ?([^/;]*) Build'
       model: '$1 $2'
       device: 'tablet'
+    - regex: 'Dell Inc./(XPS 13 9360)(?:[);/ ]|$)'
+      device: 'desktop'
+      model: '$1'
     - regex: 'Dell; ((?:Streak|Venue)[^;/\)]*)'
       model: '$1'
       device: 'tablet'