detect notebooks as desktop devices

wenboc · Aug 11, 2020 · 2d039b6 · 2d039b6
1 parent 7feb800
commit 2d039b6
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 63 deletions.
diff --git a/DeviceDetector.php b/DeviceDetector.php
@@ -34,7 +34,6 @@
  * @method boolean isTV()
  * @method boolean isSmartDisplay()
  * @method boolean isCamera()
- * @method boolean isNotebook()
  *
  * Magic Client Type Methods
  * @method boolean isBrowser()

diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php
@@ -35,7 +35,6 @@ abstract class DeviceParserAbstract extends ParserAbstract
     const DEVICE_TYPE_PHABLET              = 10;
     const DEVICE_TYPE_SMART_SPEAKER        = 11;
     const DEVICE_TYPE_WEARABLE             = 12; // including set watches, headsets
-    const DEVICE_TYPE_NOTEBOOK             = 13;
 
     /**
      * Detectable device types
@@ -56,7 +55,6 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'phablet'               => self::DEVICE_TYPE_PHABLET,
         'smart speaker'         => self::DEVICE_TYPE_SMART_SPEAKER,
         'wearable'              => self::DEVICE_TYPE_WEARABLE,
-        'notebook'              => self::DEVICE_TYPE_NOTEBOOK,
     );
 
     /**
@@ -154,7 +152,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'CH' => 'Cherry Mobile',
         '1C' => 'Chuwi',
         'L8' => 'Clarmin',
-        'C0' => 'Clout',
+        'CZ' => 'Clout',
         'CK' => 'Cricket',
         'C1' => 'Crosscall',
         'CL' => 'Compal',

diff --git a/Parser/Device/Notebook.php b/Parser/Device/Notebook.php
@@ -10,7 +10,7 @@
 /**
  * Class Notebook
  *
- * Device parser for notebook detection
+ * Device parser for notebook detection in Facebook useragents
  *
  * @package DeviceDetector\Parser\Device
  */
@@ -21,7 +21,7 @@ class Notebook extends DeviceParserAbstract
 
     public function parse()
     {
-        if (!$this->preMatchOverall()) {
+        if (!$this->matchUserAgent('FBMD/')) {
             return false;
         }
 

diff --git a/Tests/DeviceDetectorTest.php b/Tests/DeviceDetectorTest.php
@@ -313,7 +313,6 @@ public function testMagicMMethods()
         $this->assertFalse($dd->isConsole());
         $this->assertFalse($dd->isPortableMediaPlayer());
         $this->assertFalse($dd->isCamera());
-        $this->assertFalse($dd->isNotebook());
 
         $this->assertTrue($dd->isBrowser());
         $this->assertFalse($dd->isLibrary());

diff --git a/Tests/Parser/Devices/fixtures/notebook.yml b/Tests/Parser/Devices/fixtures/notebook.yml
@@ -2,6 +2,6 @@
 - 
   user_agent: Mozilla/5.0 (Windows NT 10.0.16299.125; osmeta 10.3.3308) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.3308 Build/3308 [FBAN/FBW;FBAV/140.0.0.232.179;FBBV/83145113;FBDV/WindowsDevice;FBMD/80VR;FBSN/Windows;FBSV/10.0.16299.371;FBSS/1;FBCR/;FBID/desktop;FBLC/ru_RU;FBOP/45;FBRV/0]
   device:
-    type: 13
+    type: 0
     brand: LE
     model: Legion Y720