WhichBrowser · summercms · Oct 9, 2020 · Oct 24, 2020 · Oct 24, 2020 · Oct 24, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,12 @@ dist: trusty
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
   - 7.3
   - 7.4
+  # - 8.0 (Release Date: November 26, 2020)
 
 before_script:
   - composer self-update
@@ -22,20 +20,20 @@ before_script:
   # Set memory limit to 2 MB
   - echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-  # Disable X-debug on all but PHP 5.6
-  - if [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then phpenv config-rm xdebug.ini; fi
+  # Disable X-debug on all but PHP 7.0
+  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then phpenv config-rm xdebug.ini; fi
 
 script:
   - vendor/bin/phpcs --standard=PSR1,PSR2 -n src
 
-  # Run tests (all except PHP 5.6)
-  - if [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then php bin/runner.php --show check; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then vendor/bin/phpunit; fi
+  # Run tests (all except PHP 7.0)
+  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then php bin/runner.php --show check; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then vendor/bin/phpunit; fi
 
-  # Run tests with coverage enabled (only PHP 5.6)
-  - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then php bin/runner.php --coverage --show check; fi
-  - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then vendor/bin/phpunit --coverage-clover phpunit.xml; fi
+  # Run tests with coverage enabled (only PHP 7.0)
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then php bin/runner.php --coverage --show check; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then vendor/bin/phpunit --coverage-clover phpunit.xml; fi
 
 after_script:
   # Upload coverage to Coveralls.io
-  - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then travis_retry php vendor/bin/coveralls -v; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then travis_retry php vendor/bin/coveralls -v; fi
diff --git a/data/regexes/applications-browsers.php b/data/regexes/applications-browsers.php
@@ -2,4 +2,4 @@
 
 namespace WhichBrowser\Data;
 
-Applications::$BROWSERS_REGEX = '/(115|126|2345|37abc|qihu|1stbrowser|7star|abrowse|acorn|acoo|amigo|aol|america|apus|arachne|arora|aweb|avant|asw|avg|aviator|avira|flyflow|bdbrowser|bdspark|basilisk|beamrise|beonex|blackwren|blackhawk|bolt|blackbird|brave|brisk|browsex|browzar|byffox|camino|canure|ccleaner|cent|charon|chedot|cheshire|chimlac|chimera|chromeplus|colibri|columbus|cometbird|comodo|dragon|conkeror|coc|coolnovo|corom|crazy|crusta|cunaguaro|cyberdog|cyberfox|daedalus|degan|demeter|deskbrowse|diigo|dillo|doczilla|rhodonit|dplus|elements|eudoraweb|falkon|flamesky|flock|framafox|freeu|galeon|globalmojo|epiphany|greenbrowser|hola|hydra|ibrowse|icab|iceape|icecat|icedove|iceweasel|irider|iridium|iron|kapiko|kazehakase|kchrome|kinza|kkman|klondike|kylo|meleon|lbrowser|lbbrowser|light|lobo|lolifox|lovense|lunascape|naenara|netcaptor|madfox|mxbrowser|min|mini|mixshark|mlbrowser|mypal|multixp|netpositive|nichrome|origyn|owb|live|juzi|orca|oregano|otter|palemoon|patriott|perk|polarity|privacy|qiyu|qtweb|quicklook|qupzilla|qute|rekonq|ryouko|sylera|saayaa|salam|shiira|sielo|sitekiosk|sleipnir|slimjet|metasr|sparrow|stainless|station|sunchrome|sundance|sundial|superbird|swiftweasel|swiftfox|swing|to-browser|tencent|tenfourfox|theworld|tulip|tungsten|ultrab|usejump|vimprobable|vivaldi|airwatch|vonkeror|voyager|waterfox|whale|winwap|xvast|yabrowser|zvu|zipzap|1password|3g explorer|4g explorer|aloha|atomiclite|au|awakening|baidu|bdmobile|bidu|baiduboxapp|browser|blazer|acheetahi|cornowser|coolmarket|cute|digia|doris|doroty|www browser|epic|eui|go\.web|helium|heytap|huohoubrowser|surfboard|isurf|jig browser|jumanji|tnsbrowser|kiosk|kiwi|lebrowser|liebao|macross|mammoth|mcent|mint|mib|cmcs|motorola|multizilla|netfrontlife|onebrowser|oneplus|plink|polaris|pure|openwave|up|km|oppo|quark|realme|semc|stnc|sogou|symphony|tenta|ucpro|vivo|weblite|wk|yaani|alti|aplix|awox|browserserver|isis|netbox|spyglass|oregan|viera|zetakey|bunjalloo|nwf|nuanti|wib|prince|demobrowser|dooble|dwb|evm|fireweb|hive|intermec|phantom|qt|roccat|raven|rockmelt|scope|slim|smbrowser|snowshoe|sputnik|surf|tao|taz|uzbl|villanova|vimb|wada|wavelink|webrender|webster|wyzo|yelang|yrcweb|linemode|lynx|links|w3m|nimbus|Webwasher|sankore|adapi|brightsign|coship)/i';
+Applications::$BROWSERS_REGEX = '/(115|126|2345|37abc|qihu|1stbrowser|7star|abrowse|acorn|acoo|amigo|aol|america|apus|arachne|arora|aweb|avant|asw|avg|aviator|avira|flyflow|bdbrowser|bdspark|basilisk|beamrise|beonex|blackwren|blackhawk|bolt|blackbird|brave|brisk|browsex|browzar|byffox|camino|canure|ccleaner|cent|charon|chedot|cheshire|chimlac|chimera|chromeplus|colibri|columbus|cometbird|comodo|dragon|conkeror|coc|coolnovo|corom|crazy|crusta|cunaguaro|cyberdog|cyberfox|daedalus|degan|demeter|deskbrowse|diigo|dillo|doczilla|rhodonit|dplus|elements|eudoraweb|falkon|flamesky|flock|framafox|freeu|galeon|globalmojo|epiphany|greenbrowser|hola|hydra|ibrowse|icab|iceape|icecat|icedove|iceweasel|irider|iridium|iron|kapiko|kazehakase|kchrome|kinza|kkman|klondike|kylo|meleon|lbrowser|lbbrowser|light|lobo|lolifox|lovense|lunascape|naenara|netcaptor|madfox|mxbrowser|min|mini|mixshark|mlbrowser|mypal|multixp|netpositive|nichrome|origyn|owb|live|juzi|orca|oregano|otter|palemoon|patriott|perk|polarity|privacy|qiyu|qtweb|quicklook|qupzilla|qute|rekonq|ryouko|sylera|saayaa|salam|shiira|sielo|sitekiosk|sleipnir|slimjet|metasr|sparrow|stainless|station|sunchrome|sundance|sundial|superbird|swiftweasel|swiftfox|swing|to-browser|tencent|tenfourfox|theworld|tulip|tungsten|ultrab|usejump|vimprobable|vivaldi|airwatch|vonkeror|voyager|waterfox|whale|winwap|xvast|yabrowser|zvu|zipzap|1password|3g explorer|4g explorer|aloha|atomiclite|au|awakening|baidu|bdmobile|bidu|baiduboxapp|browser|blazer|acheetahi|cornowser|coolmarket|cute|digia|doris|doroty|ecosia|www browser|epic|eui|go\.web|helium|heytap|huohoubrowser|surfboard|isurf|jig browser|jumanji|tnsbrowser|kiosk|kiwi|lebrowser|liebao|macross|mammoth|mcent|mint|mobicip|mib|cmcs|motorola|multizilla|netfrontlife|onebrowser|oneplus|plink|polaris|pure|openwave|up|km|oppo|quark|realme|semc|stnc|sogou|symphony|tenta|ucpro|vivo|weblite|wk|yaani|alti|aplix|awox|browserserver|isis|netbox|spyglass|oregan|viera|zetakey|bunjalloo|nwf|nuanti|wib|prince|demobrowser|dooble|dwb|evm|fireweb|hive|intermec|phantom|qt|roccat|raven|rockmelt|scope|slim|smbrowser|snowshoe|sputnik|surf|tao|taz|uzbl|villanova|vimb|wada|wavelink|webrender|webster|wyzo|yelang|yrcweb|linemode|lynx|links|w3m|nimbus|Webwasher|sankore|adapi|brightsign|coship)/i';
diff --git a/data/regexes/applications-others.php b/data/regexes/applications-others.php
@@ -2,4 +2,4 @@
 
 namespace WhichBrowser\Data;
 
-Applications::$OTHERS_REGEX = '/(itunes|qt|bluefish|nightingale|songbird|stagefright|substream|vlc|windows-media|coreplayer|flycast|boxee|kodi|xbmc|lightning|thunderbird|outlook|lotus|postbox|bat|yahoo|daum|flipboard|akregator|blogos|cococ|feed|liferea|news|jetbrains|rss|reeder|reedkit|rome|ziepod|messenger|kakao|kik|line|slack|viber|whatsapp|wire|yammer|fbios|fb4a|googleplus|instagram|pinterest|weibo|tumblr|twitter|wp-android|yelp|office|bingweb|hao123|gsa|naver|sogousearch|yandex|atom|golive|brackets|iweb|frontpage|amaya|websphere|download|tansodl|origin|secondlife|valve|raptr|alipay|cooliris|google|leechcraft|expeditor)/i';
+Applications::$OTHERS_REGEX = '/(itunes|qt|bluefish|nightingale|songbird|stagefright|substream|vlc|windows-media|coreplayer|flycast|boxee|kodi|xbmc|lightning|thunderbird|outlook|lotus|postbox|bat|yahoo|daum|flipboard|akregator|blogos|cococ|feed|liferea|news|jetbrains|rss|reeder|reedkit|rome|ziepod|messenger|kakao|kik|line|slack|viber|whatsapp|wire|yammer|zalo|fbios|fb4a|googleplus|instagram|pinterest|weibo|tumblr|twitter|wp-android|yelp|office|bingweb|hao123|gsa|naver|sogousearch|yandex|atom|golive|brackets|iweb|frontpage|amaya|websphere|download|tansodl|origin|secondlife|valve|raptr|alipay|cooliris|google|leechcraft|expeditor)/i';
diff --git a/src/Analyser/Header/Useragent/Bot.php b/src/Analyser/Header/Useragent/Bot.php
@@ -42,6 +42,17 @@ private function &detectBot($ua)
             $this->data->device->type = Constants\DeviceType::BOT;
         }
 
+        /* Detect petal and aspiegel bots */
+
+        if (preg_match('/(PetalBot|Aspiegel)/iu', $ua, $match)) {
+            $this->data->browser->reset();
+            $this->data->device->reset();
+
+            $this->data->browser->name = 'Petal Bot';
+
+            $this->data->device->type = Constants\DeviceType::BOT;
+        }
+
         return $this;
     }
 }
diff --git a/tests/data/bots/generic.yaml b/tests/data/bots/generic.yaml
@@ -586,3 +586,15 @@
     headers: 'User-Agent: PocketParser/2.0 (+https://getpocket.com/pocketparser_ua)'
     readable: 'Pocket 2.0'
     result: { browser: { name: Pocket, version: '2.0' }, device: { type: bot } }
+-
+    headers: 'User-Agent: Mozilla/5.0 (Linux; Android 7.0;) AppleWebKit/537.36 (KHTML, like Gecko) Mobile Safari/537.36 (compatible; AspiegelBot)'
+    readable: 'Petal Bot'
+    result: { browser: { name: 'Petal Bot' }, device: { type: bot } }
+-
+    headers: 'User-Agent: Mozilla/5.0 (Linux; Android 7.0;) AppleWebKit/537.36 (KHTML, like Gecko) Mobile Safari/537.36 (compatible; PetalBot;+https://aspiegel.com/petalbot)'
+    readable: 'Petal Bot'
+    result: { browser: { name: 'Petal Bot' }, device: { type: bot } }
+-
+    headers: 'User-Agent: (compatible;PetalBot;+https://aspiegel.com/petalbot)'
+    readable: 'Petal Bot'
+    result: { browser: { name: 'Petal Bot' }, device: { type: bot } }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		namespace WhichBrowser\Data;

		Applications::$BROWSERS_REGEX = '/(115\|126\|2345\|37abc\|qihu\|1stbrowser\|7star\|abrowse\|acorn\|acoo\|amigo\|aol\|america\|apus\|arachne\|arora\|aweb\|avant\|asw\|avg\|aviator\|avira\|flyflow\|bdbrowser\|bdspark\|basilisk\|beamrise\|beonex\|blackwren\|blackhawk\|bolt\|blackbird\|brave\|brisk\|browsex\|browzar\|byffox\|camino\|canure\|ccleaner\|cent\|charon\|chedot\|cheshire\|chimlac\|chimera\|chromeplus\|colibri\|columbus\|cometbird\|comodo\|dragon\|conkeror\|coc\|coolnovo\|corom\|crazy\|crusta\|cunaguaro\|cyberdog\|cyberfox\|daedalus\|degan\|demeter\|deskbrowse\|diigo\|dillo\|doczilla\|rhodonit\|dplus\|elements\|eudoraweb\|falkon\|flamesky\|flock\|framafox\|freeu\|galeon\|globalmojo\|epiphany\|greenbrowser\|hola\|hydra\|ibrowse\|icab\|iceape\|icecat\|icedove\|iceweasel\|irider\|iridium\|iron\|kapiko\|kazehakase\|kchrome\|kinza\|kkman\|klondike\|kylo\|meleon\|lbrowser\|lbbrowser\|light\|lobo\|lolifox\|lovense\|lunascape\|naenara\|netcaptor\|madfox\|mxbrowser\|min\|mini\|mixshark\|mlbrowser\|mypal\|multixp\|netpositive\|nichrome\|origyn\|owb\|live\|juzi\|orca\|oregano\|otter\|palemoon\|patriott\|perk\|polarity\|privacy\|qiyu\|qtweb\|quicklook\|qupzilla\|qute\|rekonq\|ryouko\|sylera\|saayaa\|salam\|shiira\|sielo\|sitekiosk\|sleipnir\|slimjet\|metasr\|sparrow\|stainless\|station\|sunchrome\|sundance\|sundial\|superbird\|swiftweasel\|swiftfox\|swing\|to-browser\|tencent\|tenfourfox\|theworld\|tulip\|tungsten\|ultrab\|usejump\|vimprobable\|vivaldi\|airwatch\|vonkeror\|voyager\|waterfox\|whale\|winwap\|xvast\|yabrowser\|zvu\|zipzap\|1password\|3g explorer\|4g explorer\|aloha\|atomiclite\|au\|awakening\|baidu\|bdmobile\|bidu\|baiduboxapp\|browser\|blazer\|acheetahi\|cornowser\|coolmarket\|cute\|digia\|doris\|doroty\|www browser\|epic\|eui\|go\.web\|helium\|heytap\|huohoubrowser\|surfboard\|isurf\|jig browser\|jumanji\|tnsbrowser\|kiosk\|kiwi\|lebrowser\|liebao\|macross\|mammoth\|mcent\|mint\|mib\|cmcs\|motorola\|multizilla\|netfrontlife\|onebrowser\|oneplus\|plink\|polaris\|pure\|openwave\|up\|km\|oppo\|quark\|realme\|semc\|stnc\|sogou\|symphony\|tenta\|ucpro\|vivo\|weblite\|wk\|yaani\|alti\|aplix\|awox\|browserserver\|isis\|netbox\|spyglass\|oregan\|viera\|zetakey\|bunjalloo\|nwf\|nuanti\|wib\|prince\|demobrowser\|dooble\|dwb\|evm\|fireweb\|hive\|intermec\|phantom\|qt\|roccat\|raven\|rockmelt\|scope\|slim\|smbrowser\|snowshoe\|sputnik\|surf\|tao\|taz\|uzbl\|villanova\|vimb\|wada\|wavelink\|webrender\|webster\|wyzo\|yelang\|yrcweb\|linemode\|lynx\|links\|w3m\|nimbus\|Webwasher\|sankore\|adapi\|brightsign\|coship)/i';
		Applications::$BROWSERS_REGEX = '/(115\|126\|2345\|37abc\|qihu\|1stbrowser\|7star\|abrowse\|acorn\|acoo\|amigo\|aol\|america\|apus\|arachne\|arora\|aweb\|avant\|asw\|avg\|aviator\|avira\|flyflow\|bdbrowser\|bdspark\|basilisk\|beamrise\|beonex\|blackwren\|blackhawk\|bolt\|blackbird\|brave\|brisk\|browsex\|browzar\|byffox\|camino\|canure\|ccleaner\|cent\|charon\|chedot\|cheshire\|chimlac\|chimera\|chromeplus\|colibri\|columbus\|cometbird\|comodo\|dragon\|conkeror\|coc\|coolnovo\|corom\|crazy\|crusta\|cunaguaro\|cyberdog\|cyberfox\|daedalus\|degan\|demeter\|deskbrowse\|diigo\|dillo\|doczilla\|rhodonit\|dplus\|elements\|eudoraweb\|falkon\|flamesky\|flock\|framafox\|freeu\|galeon\|globalmojo\|epiphany\|greenbrowser\|hola\|hydra\|ibrowse\|icab\|iceape\|icecat\|icedove\|iceweasel\|irider\|iridium\|iron\|kapiko\|kazehakase\|kchrome\|kinza\|kkman\|klondike\|kylo\|meleon\|lbrowser\|lbbrowser\|light\|lobo\|lolifox\|lovense\|lunascape\|naenara\|netcaptor\|madfox\|mxbrowser\|min\|mini\|mixshark\|mlbrowser\|mypal\|multixp\|netpositive\|nichrome\|origyn\|owb\|live\|juzi\|orca\|oregano\|otter\|palemoon\|patriott\|perk\|polarity\|privacy\|qiyu\|qtweb\|quicklook\|qupzilla\|qute\|rekonq\|ryouko\|sylera\|saayaa\|salam\|shiira\|sielo\|sitekiosk\|sleipnir\|slimjet\|metasr\|sparrow\|stainless\|station\|sunchrome\|sundance\|sundial\|superbird\|swiftweasel\|swiftfox\|swing\|to-browser\|tencent\|tenfourfox\|theworld\|tulip\|tungsten\|ultrab\|usejump\|vimprobable\|vivaldi\|airwatch\|vonkeror\|voyager\|waterfox\|whale\|winwap\|xvast\|yabrowser\|zvu\|zipzap\|1password\|3g explorer\|4g explorer\|aloha\|atomiclite\|au\|awakening\|baidu\|bdmobile\|bidu\|baiduboxapp\|browser\|blazer\|acheetahi\|cornowser\|coolmarket\|cute\|digia\|doris\|doroty\|ecosia\|www browser\|epic\|eui\|go\.web\|helium\|heytap\|huohoubrowser\|surfboard\|isurf\|jig browser\|jumanji\|tnsbrowser\|kiosk\|kiwi\|lebrowser\|liebao\|macross\|mammoth\|mcent\|mint\|mobicip\|mib\|cmcs\|motorola\|multizilla\|netfrontlife\|onebrowser\|oneplus\|plink\|polaris\|pure\|openwave\|up\|km\|oppo\|quark\|realme\|semc\|stnc\|sogou\|symphony\|tenta\|ucpro\|vivo\|weblite\|wk\|yaani\|alti\|aplix\|awox\|browserserver\|isis\|netbox\|spyglass\|oregan\|viera\|zetakey\|bunjalloo\|nwf\|nuanti\|wib\|prince\|demobrowser\|dooble\|dwb\|evm\|fireweb\|hive\|intermec\|phantom\|qt\|roccat\|raven\|rockmelt\|scope\|slim\|smbrowser\|snowshoe\|sputnik\|surf\|tao\|taz\|uzbl\|villanova\|vimb\|wada\|wavelink\|webrender\|webster\|wyzo\|yelang\|yrcweb\|linemode\|lynx\|links\|w3m\|nimbus\|Webwasher\|sankore\|adapi\|brightsign\|coship)/i';