Merge pull request #22 from woothee/prepare_v1.2.0

v1.2.0

.travis.yml

@@ -5,10 +5,12 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7
   - hhvm
 
 matrix:
   allow_failures:
+    - php: 7
     - php: hhvm
 
 before_script:

composer.json

@@ -13,10 +13,10 @@
         "php": ">= 5.3.3"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4.1.0",
-        "satooshi/php-coveralls": ">=0.6.0",
-        "symfony/yaml": ">=2.4.0",
-        "fabpot/php-cs-fixer": ">=0.4.0"
+        "phpunit/phpunit": "4.8.*",
+        "satooshi/php-coveralls": "0.6.*",
+        "symfony/yaml": "2.7.*",
+        "fabpot/php-cs-fixer": "1.10.*"
     },
     "autoload": {
         "psr-4": { "Woothee\\": "src/" }

src/AgentCategory/Browser/SafariChrome.php

@@ -15,6 +15,19 @@ public static function challenge($ua, &$result)
 
         $version = DataSet::VALUE_UNKNOWN;
 
+        $epos = strpos($ua, 'Edge');
+
+        if ($epos > -1) {
+            if (preg_match('#Edge/([.0-9]+)#', $ua, $matches)) {
+                $version = $matches[1];
+
+                static::updateMap($result, DataSet::get('Edge'));
+                static::updateVersion($result, $version);
+
+                return true;
+            }
+        }
+
         $cpos = strpos($ua, 'Chrome');
 
         if ($cpos === false) {

src/AgentCategory/Browser/Webview.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Woothee\AgentCategory\Browser;
+
+use Woothee\AgentCategory\AbstractCategory;
+use Woothee\DataSet;
+
+class Webview extends AbstractCategory
+{
+    public static function challenge($ua, &$result)
+    {
+        if (strpos($ua, 'like Mac OS X') < 0) {
+            return false;
+        }
+
+        $version = DataSet::VALUE_UNKNOWN;
+
+        if (preg_match('/iP(?:hone;|ad;|od) .*like Mac OS X/', $ua, $matches)) {
+            if (preg_match('#Version/([.0-9]+)#', $ua, $matches)) {
+                $version = $matches[1];
+            }
+
+            static::updateMap($result, DataSet::get('Webview'));
+            static::updateVersion($result, $version);
+
+            return true;
+        }
+
+        return false;
+    }
+}

src/AgentCategory/Crawler/Crawlers.php

@@ -64,6 +64,10 @@ public static function challenge($ua, &$result)
         } elseif (strpos($ua, 'facebookexternalhit') !== false) {
             static::updateMap($result, DataSet::get('facebook'));
 
+            return true;
+        } elseif (strpos($ua, 'Twitterbot/') !== false) {
+            static::updateMap($result, DataSet::get('twitter'));
+
             return true;
         } elseif (strpos($ua, 'ichiro') !== false) {
             if (strpos($ua, 'http://help.goo.ne.jp/door/crawler.html') !== false || strpos($ua, 'compatible; ichiro/mobile goo;') !== false) {

src/AgentCategory/Os/SmartPhone.php

@@ -25,6 +25,11 @@ public static function challenge($ua, &$result)
             $data = DataSet::get('Android');
         } elseif (strpos($ua, 'CFNetwork') !== false) {
             $data = DataSet::get('iOS');
+        } elseif (strpos($ua, 'BB10') !== false) {
+            $data = DataSet::get('BlackBerry10');
+            if (preg_match('#BB10(?:.+)Version/([.0-9]+)#', $ua, $matches)) {
+                $version = $matches[1];
+            }
         } elseif (strpos($ua, 'BlackBerry') !== false) {
             $data = DataSet::get('BlackBerry');
             if (preg_match('/BlackBerry(?:\\d+)\/([.0-9]+) /', $ua, $matches) === 1) {

src/AgentCategory/Os/Windows.php

@@ -37,7 +37,9 @@ public static function challenge($ua, &$result)
 
         $version = $matches[1];
 
-        if ($version === 'NT 6.3') {
+        if ($version === 'NT 10.0') {
+            $data = DataSet::get('Win10');
+        } elseif ($version === 'NT 6.3') {
             $data = DataSet::get('Win8.1');
         } elseif ($version === 'NT 6.2') {
             $data = DataSet::get('Win8');

src/Classifier.php

@@ -10,6 +10,7 @@
 use Woothee\AgentCategory\Browser\Opera;
 use Woothee\AgentCategory\Browser\SafariChrome;
 use Woothee\AgentCategory\Browser\Sleipnir;
+use Woothee\AgentCategory\Browser\Webview;
 use Woothee\AgentCategory\Crawler\Crawlers;
 use Woothee\AgentCategory\Crawler\Google;
 use Woothee\AgentCategory\Crawler\MayBeCrawler;
@@ -77,6 +78,10 @@ public function tryBrowser($ua, &$result)
             return true;
         }
 
+        if (Webview::challenge($ua, $result)) {
+            return true;
+        }
+
         return false;
     }
 

src/DataSet.php

@@ -1,7 +1,7 @@
 <?php
 namespace Woothee;
 
-// GENERATED from dataset.yml at Sun Oct 26 00:45:06 JST 2014 by okonomi
+// GENERATED from dataset.yml at Thu Aug 13 20:42:56 JST 2015 by yuya
 class DataSet
 {
     const DATASET_KEY_LABEL            = 'label';
@@ -58,6 +58,12 @@ class DataSet
             'type'     => 'browser',
             'vendor'   => 'Microsoft',
         ),
+        'Edge' => array(
+            'label'    => 'Edge',
+            'name'     => 'Edge',
+            'type'     => 'browser',
+            'vendor'   => 'Microsoft',
+        ),
         'Chrome' => array(
             'label'    => 'Chrome',
             'name'     => 'Chrome',
@@ -88,12 +94,24 @@ class DataSet
             'type'     => 'browser',
             'vendor'   => 'Fenrir Inc.',
         ),
+        'Webview' => array(
+            'label'    => 'Webview',
+            'name'     => 'Webview',
+            'type'     => 'browser',
+            'vendor'   => 'OS vendor',
+        ),
         'Win' => array(
             'label'    => 'Win',
             'name'     => 'Windows UNKNOWN Ver',
             'type'     => 'os',
             'category' => 'pc',
         ),
+        'Win10' => array(
+            'label'    => 'Win10',
+            'name'     => 'Windows 10',
+            'type'     => 'os',
+            'category' => 'pc',
+        ),
         'Win8.1' => array(
             'label'    => 'Win8.1',
             'name'     => 'Windows 8.1',
@@ -238,6 +256,12 @@ class DataSet
             'type'     => 'os',
             'category' => 'smartphone',
         ),
+        'BlackBerry10' => array(
+            'label'    => 'BlackBerry10',
+            'name'     => 'BlackBerry 10',
+            'type'     => 'os',
+            'category' => 'smartphone',
+        ),
         'docomo' => array(
             'label'    => 'docomo',
             'name'     => 'docomo',
@@ -508,6 +532,12 @@ class DataSet
             'type'     => 'full',
             'category' => 'crawler',
         ),
+        'twitter' => array(
+            'label'    => 'twitter',
+            'name'     => 'twitter',
+            'type'     => 'full',
+            'category' => 'crawler',
+        ),
         'mixi' => array(
             'label'    => 'mixi',
             'name'     => 'mixi',