Adds detection for Condor devices (www.condor.dz) (#5677)

* adds detections for some new devices * Adds detection for Condor devices (www.condor.dz) * Improves detection for Meizu Mx Note devices * sorts test fixtures * fix test ua
matomo-org · Nov 8, 2017 · 2300227 · 2300227
1 parent a4333d4
commit 2300227
Show file tree

Hide file tree

Showing 15 changed files with 18,664 additions and 17,836 deletions.
diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php
@@ -116,6 +116,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'CT' => 'Capitel',
         'CQ' => 'Compaq',
         'CO' => 'Coolpad',
+        'C5' => 'Condor',
         'CW' => 'Cowon',
         'CU' => 'Cube',
         'CY' => 'Coby Kyros',

diff --git a/Tests/Cache/PSR16CacheTest.php b/Tests/Cache/PSR16CacheTest.php
@@ -11,6 +11,10 @@
 use MatthiasMullie\Scrapbook\Adapters\MemoryStore;
 use MatthiasMullie\Scrapbook\Psr16\SimpleCache;
 
+if (!class_exists('\MatthiasMullie\Scrapbook\Adapters\MemoryStore')) {
+    return;
+}
+
 class PSR16CacheTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()

diff --git a/Tests/Cache/PSR6CacheTest.php b/Tests/Cache/PSR6CacheTest.php
@@ -11,6 +11,10 @@
 use MatthiasMullie\Scrapbook\Adapters\MemoryStore;
 use MatthiasMullie\Scrapbook\Psr6\Pool;
 
+if (!class_exists('\MatthiasMullie\Scrapbook\Adapters\MemoryStore')) {
+    return;
+}
+
 class PSR6CacheTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()

diff --git a/Tests/fixtures/bots.yml b/Tests/fixtures/bots.yml
@@ -696,6 +696,12 @@
     producer:
       name: ""
       url: ""
+- 
+  user_agent: Mozilla/5.0 (compatible; Findxbot/1.0; +http://www.findxbot.com)
+  bot:
+    name: Findxbot
+    category: Crawler
+    url: http://www.findxbot.com
 - 
   user_agent: Mozilla/5.0 (compatible; FlipboardProxy/1.2; +http://flipboard.com/browserproxy)
   bot:
@@ -1828,6 +1834,15 @@
     producer:
       name: SEO Engine
       url: http://www.seoengine.com
+- 
+  user_agent: Mozilla/5.0 (compatible; SEOkicks-Robot; +http://www.seokicks.de/robot.html)
+  bot:
+    name: SEOkicks-Robot
+    category: Crawler
+    url: http://www.seokicks.de/robot.html
+    producer:
+      name: SEOkicks
+      url: https://www.seokicks.de/
 - 
   user_agent: Mozilla/5.0 (compatible; SISTRIX Crawler; http://crawler.sistrix.net/)
   bot:
@@ -2141,6 +2156,15 @@
     producer:
       name: Domain Tools
       url: http://www.domaintools.com
+- 
+  user_agent: TLSProbe/1.0 (+https://scan.trustnet.venafi.com/)
+  bot:
+    name: TLSProbe
+    url: https://scan.trustnet.venafi.com/
+    category: Security search bot
+    producer:
+      name: Venafi TrustNet
+      url: https://www.venafi.com
 - 
   user_agent: TelegramBot (like TwitterBot)
   bot:
@@ -2353,6 +2377,14 @@
     producer:
       name: W3C
       url: http://www.w3.org
+- 
+  user_agent: Mozilla/5.0 (compatible; Wappalyzer; +https://github.com/AliasIO/Wappalyzer)
+  bot:
+    name: Wappalyzer
+    url: https://github.com/AliasIO/Wappalyzer
+    producer:
+      name: AliasIO
+      url: https://github.com/AliasIO
 - 
   user_agent: WeSEE:Search/0.1 (Alpha, http://www.wesee.com/en/support/bot/)
   bot:
@@ -2380,6 +2412,15 @@
     producer:
       name: Steve Webb
       url: http://badcheese.com
+- 
+  user_agent: WordPress/4.7.2; https://example.com
+  bot:
+    name: WordPress
+    category: Service Agent
+    url: https://wordpress.org/
+    producer:
+      name: Wordpress.org
+      url: https://wordpress.org/
 - 
   user_agent: Wotbox/2.01 (+http://www.wotbox.com/bot/)
   bot:
@@ -2793,44 +2834,3 @@
     name: zgrab
     category: Security Checker
     url: https://github.com/zmap/zgrab
--
-  user_agent: TLSProbe/1.0 (+https://scan.trustnet.venafi.com/)
-  bot:
-    name: TLSProbe
-    url: https://scan.trustnet.venafi.com/
-    category: Security search bot
-    producer:
-      name: Venafi TrustNet
-      url: https://www.venafi.com
--
-  user_agent: WordPress/4.7.2; https://example.com
-  bot:
-    name: WordPress
-    category: Service Agent
-    url: https://wordpress.org/
-    producer:
-      name: Wordpress.org
-      url: https://wordpress.org/
--
-  user_agent: Mozilla/5.0 (compatible; Wappalyzer; +https://github.com/AliasIO/Wappalyzer)
-  bot:
-    name: Wappalyzer
-    url: https://github.com/AliasIO/Wappalyzer
-    producer:
-      name: AliasIO
-      url: https://github.com/AliasIO
--
-  user_agent: Mozilla/5.0 (compatible; SEOkicks-Robot; +http://www.seokicks.de/robot.html)
-  bot:
-    name: SEOkicks-Robot
-    category: Crawler
-    url: http://www.seokicks.de/robot.html
-    producer:
-      name: SEOkicks
-      url: https://www.seokicks.de/
--
-  user_agent: Mozilla/5.0 (compatible; Findxbot/1.0; +http://www.findxbot.com)
-  bot:
-    name: Findxbot
-    category: Crawler
-    url: http://www.findxbot.com
diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml
@@ -439,6 +439,26 @@
     model: M3 Note
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 7.1.2; MZ-M6 Note Build/N2G47H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/45.0.2454.94 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "7.1.2"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "45.0.2454.94"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: phablet
+    brand: M1
+    model: M6 Note
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 4.2.1; M-PP2G530 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Mobile Safari/537.36
   os: