Merge pull request #48 from tell-k/master

Catch up with woothee v1.10.0
woothee · May 20, 2019 · 7f3665c · 7f3665c
2 parents cb72f71 + 2c1349f
commit 7f3665c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/AgentCategory/Browser/SafariChrome.php b/src/AgentCategory/Browser/SafariChrome.php
@@ -19,10 +19,10 @@ public static function challenge($ua, &$result)
 
         $version = DataSet::VALUE_UNKNOWN;
 
-        $epos = strpos($ua, 'Edge');
+        $epos = strpos($ua, 'Edg');
 
         if ($epos > -1) {
-            if (preg_match('#Edge/([.0-9]+)#', $ua, $matches)) {
+            if (preg_match('/(?:Edge|Edg|EdgiOS|EdgA)\/([.0-9]+)/', $ua, $matches)) {
                 $version = $matches[1];
 
                 static::updateMap($result, DataSet::get('Edge'));

diff --git a/src/AgentCategory/Os/Linux.php b/src/AgentCategory/Os/Linux.php
@@ -18,7 +18,8 @@ public static function challenge($ua, &$result)
 
         if (strpos($ua, 'Android') !== false) {
             $data = DataSet::get('Android');
-            if (preg_match('/Android[- ](\\d+\\.\\d+(?:\\.\\d+)?)/', $ua, $matches)) {
+
+            if (preg_match('/Android[- ](\\d+(?:\\.\\d+(?:\\.\\d+)?)?)/', $ua, $matches)) {
                 $version = $matches[1];
             }
         }

diff --git a/src/Classifier.php b/src/Classifier.php
@@ -34,7 +34,7 @@
 
 class Classifier
 {
-    const VERSION = '1.8.0';
+    const VERSION = '1.10.0';
 
     public function isCrawler($ua)
     {

diff --git a/woothee b/woothee
+4 −0		README.md
+8 −1		testsets/pc_windows.yaml
+16 −0		testsets/smartphone_android.yaml
+8 −0		testsets/smartphone_ios.yaml