Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into stable
Browse files Browse the repository at this point in the history
# Conflicts:
#	DeviceDetector.php
  • Loading branch information
pongee committed Mar 31, 2020
2 parents aa2186e + 6a92e45 commit d1f13ba
Show file tree
Hide file tree
Showing 56 changed files with 64,829 additions and 49,635 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Tests/ export-ignore
misc/ export-ignore
.github/ export-ignore
.coveralls.yml export-ignore
.travis.yml export-ignore
phpunit.xml.dist export-ignore
.gitignore export-ignore
.gitattributes export-ignore
.php_cs export-ignore
.php_cs export-ignore
59 changes: 59 additions & 0 deletions .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Update README.md

on:
push:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-suggest

- name: update readme
run: php misc/update-readme.php

- name: Prepare git config
run: |
cat <<- EOF > $HOME/.netrc
machine github.com
login $GITHUB_ACTOR
password $GITHUB_TOKEN
machine api.github.com
login $GITHUB_ACTOR
password $GITHUB_TOKEN
EOF
chmod 600 $HOME/.netrc
git config --global user.email "[email protected]"
git config --global user.name "$GITHUB_ACTOR"
- name: push changes & create PR
run: |
changes=($( git diff --numstat ))
if [[ ${changes[0]} -gt 1 ]]
then
cd $GITHUB_WORKSPACE
git push origin --delete updatereadme || true
git branch -D updatereadme || true
git checkout -b updatereadme
git add README.md
git commit -m "update README.md"
git push --set-upstream origin updatereadme
curl \
--request POST \
--header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
--header 'content-type: application/json' \
--data '{
"title":"Update README.md",
"body":"updates detections in README.md",
"head":"updatereadme",
"base":"master"
}' \
--url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
fi
shell: bash
2 changes: 1 addition & 1 deletion DeviceDetector.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class DeviceDetector
/**
* Current version number of DeviceDetector
*/
const VERSION = '3.15.2';
const VERSION = '3.16.0';

/**
* Holds all registered client types
Expand Down
41 changes: 37 additions & 4 deletions Parser/Client/Browser.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class Browser extends ClientParserAbstract
'AF' => 'ANT Fresco',
'AG' => 'ANTGalio',
'AL' => 'Aloha Browser',
'AH' => 'Aloha Browser Lite',
'AM' => 'Amaya',
'AO' => 'Amigo',
'AN' => 'Android Browser',
Expand All @@ -44,18 +45,22 @@ class Browser extends ClientParserAbstract
'AW' => 'Amiga Aweb',
'AT' => 'Atomic Web Browser',
'AS' => 'Avast Secure Browser',
'VG' => 'AVG Secure Browser',
'BA' => 'Beaker Browser',
'BM' => 'Beamrise',
'BB' => 'BlackBerry Browser',
'BD' => 'Baidu Browser',
'BS' => 'Baidu Spark',
'BI' => 'Basilisk',
'BE' => 'Beonex',
'BH' => 'BlackHawk',
'BJ' => 'Bunjalloo',
'BL' => 'B-Line',
'BR' => 'Brave',
'BK' => 'BriskBard',
'BX' => 'BrowseX',
'CA' => 'Camino',
'CL' => 'CCleaner',
'CC' => 'Coc Coc',
'CD' => 'Comodo Dragon',
'C1' => 'Coast',
Expand All @@ -69,14 +74,17 @@ class Browser extends ClientParserAbstract
'CM' => 'Chrome Mobile',
'CN' => 'CoolNovo',
'CO' => 'CometBird',
'CB' => 'COS Browser',
'CP' => 'ChromePlus',
'CR' => 'Chromium',
'CY' => 'Cyberfox',
'CS' => 'Cheshire',
'CT' => 'Crusta',
'CU' => 'Cunaguaro',
'CV' => 'Chrome Webview',
'DB' => 'dbrowser',
'DE' => 'Deepnet Explorer',
'DT' => 'Delta Browser',
'DF' => 'Dolphin',
'DO' => 'Dorado',
'DL' => 'Dooble',
Expand All @@ -86,14 +94,19 @@ class Browser extends ClientParserAbstract
'EI' => 'Epic',
'EL' => 'Elinks',
'EB' => 'Element Browser',
'EZ' => 'eZ Browser',
'EU' => 'EUI Browser',
'EP' => 'GNOME Web',
'ES' => 'Espial TV Browser',
'FA' => 'Falkon',
'FX' => 'Faux Browser',
'F1' => 'Firefox Mobile iOS',
'FB' => 'Firebird',
'FD' => 'Fluid',
'FE' => 'Fennec',
'FF' => 'Firefox',
'FK' => 'Firefox Focus',
'FY' => 'Firefox Reality',
'FR' => 'Firefox Rocket',
'FL' => 'Flock',
'FM' => 'Firefox Mobile',
Expand Down Expand Up @@ -126,24 +139,29 @@ class Browser extends ClientParserAbstract
'KM' => 'K-meleon',
'KO' => 'Konqueror',
'KP' => 'Kapiko',
'KN' => 'Kinza',
'KW' => 'Kiwi',
'KY' => 'Kylo',
'KZ' => 'Kazehakase',
'LB' => 'Cheetah Browser',
'LF' => 'LieBaoFast',
'LG' => 'LG Browser',
'LI' => 'Links',
'LO' => 'Lovense Browser',
'LU' => 'LuaKit',
'LS' => 'Lunascape',
'LX' => 'Lynx',
'M1' => 'mCent',
'MB' => 'MicroB',
'MC' => 'NCSA Mosaic',
'MZ' => 'Meizu Browser',
'ME' => 'Mercury',
'MF' => 'Mobile Safari',
'MI' => 'Midori',
'MO' => 'Mobicip',
'MU' => 'MIUI Browser',
'MS' => 'Mobile Silk',
'MN' => 'Minimo',
'MT' => 'Mint Browser',
'MX' => 'Maxthon',
'NB' => 'Nokia Browser',
Expand All @@ -162,14 +180,17 @@ class Browser extends ClientParserAbstract
'OD' => 'Odyssey Web Browser',
'OF' => 'Off By One',
'OE' => 'ONE Browser',
'OX' => 'Opera GX',
'OG' => 'Opera Neon',
'OH' => 'Opera Devices',
'OI' => 'Opera Mini',
'OM' => 'Opera Mobile',
'OP' => 'Opera',
'ON' => 'Opera Next',
'OO' => 'Opera Touch',
'OS' => 'Ordissimo',
'OR' => 'Oregano',
'OY' => 'Origyn Web Browser',
'OV' => 'Openwave Mobile Browser',
'OW' => 'OmniWeb',
'OT' => 'Otter Browser',
Expand Down Expand Up @@ -198,27 +219,39 @@ class Browser extends ClientParserAbstract
'SC' => 'SEMC-Browser',
'SE' => 'Sogou Explorer',
'SF' => 'Safari',
'SW' => 'SalamWeb',
'SH' => 'Shiira',
'S1' => 'SimpleBrowser',
'SK' => 'Skyfire',
'SS' => 'Seraphic Sraf',
'SL' => 'Sleipnir',
'SN' => 'Snowshoe',
'SO' => 'Sogou Mobile Browser',
'S2' => 'Splash',
'SI' => 'Sputnik Browser',
'SR' => 'Sunrise',
'SP' => 'SuperBird',
'SU' => 'Super Fast Browser',
'S0' => 'START Internet Browser',
'ST' => 'Streamy',
'SX' => 'Swiftfox',
'SZ' => 'Seznam Browser',
'TO' => 't-online.de Browser',
'TA' => 'Tao Browser',
'TF' => 'TenFourFox',
'TB' => 'Tenta Browser',
'TZ' => 'Tizen Browser',
'TS' => 'TweakStyle',
'TV' => 'TV Bro',
'UB' => 'UBrowser',
'UC' => 'UC Browser',
'UM' => 'UC Browser Mini',
'UT' => 'UC Browser Turbo',
'UZ' => 'Uzbl',
'VI' => 'Vivaldi',
'VV' => 'vivo Browser',
'VB' => 'Vision Mobile Browser',
'WI' => 'Wear Internet Browser',
'WP' => 'Web Explorer',
'WE' => 'WebPositive',
'WF' => 'Waterfox',
Expand All @@ -244,14 +277,14 @@ class Browser extends ClientParserAbstract
'BlackBerry Browser' => array('BB'),
'Baidu' => array('BD', 'BS'),
'Amiga' => array('AV', 'AW'),
'Chrome' => array('CH', 'BA', 'BR', 'CC', 'CD', 'CM', 'CI', 'CF', 'CN', 'CR', 'CP', 'DD', 'IR', 'RM', 'AO', 'TS', 'VI', 'PT', 'AS', 'TB', 'AD', 'SB', 'WP', 'I3', 'CV', 'WH', 'SZ', 'QW', 'LF', 'KW', '2B', 'CE', 'EC', 'MT', 'MS', 'HA', 'OC'),
'Firefox' => array('FF', 'FE', 'FM', 'SX', 'FB', 'PX', 'MB', 'EI', 'WF', 'CU', 'TF', 'QM', 'FR', 'I4', 'GZ', 'MO', 'F1', 'BI'),
'Chrome' => array('CH', 'BA', 'BR', 'CC', 'CD', 'CM', 'CI', 'CF', 'CN', 'CR', 'CP', 'DD', 'IR', 'RM', 'AO', 'TS', 'VI', 'PT', 'AS', 'TB', 'AD', 'SB', 'WP', 'I3', 'CV', 'WH', 'SZ', 'QW', 'LF', 'KW', '2B', 'CE', 'EC', 'MT', 'MS', 'HA', 'OC', 'MZ', 'BM', 'KN', 'SW', 'M1', 'FA', 'TA', 'AH', 'CL', 'SU', 'EU', 'UB', 'LO', 'VG', 'TV'),
'Firefox' => array('FF', 'FE', 'FM', 'SX', 'FB', 'PX', 'MB', 'EI', 'WF', 'CU', 'TF', 'QM', 'FR', 'I4', 'GZ', 'MO', 'F1', 'BI', 'MN', 'BH', 'TO', 'OS', 'FY'),
'Internet Explorer' => array('IE', 'IM', 'PS'),
'Konqueror' => array('KO'),
'NetFront' => array('NF'),
'NetSurf' => array('NE'),
'Nokia Browser' => array('NB', 'NO', 'NV', 'DO'),
'Opera' => array('OP', 'OM', 'OI', 'ON', 'OO', 'OG', 'OH', 'O1'),
'Opera' => array('OP', 'OM', 'OI', 'ON', 'OO', 'OG', 'OH', 'O1', 'OX'),
'Safari' => array('SF', 'MF', 'SO'),
'Sailfish Browser' => array('SA')
);
Expand All @@ -262,7 +295,7 @@ class Browser extends ClientParserAbstract
* @var array
*/
protected static $mobileOnlyBrowsers = array(
'36', 'OC', 'PU', 'SK', 'MF', 'OI', 'OM', 'DD', 'DB', 'ST', 'BL', 'IV', 'FM', 'C1', 'AL', 'SA', 'SB', 'FR', 'WP', 'HA', 'NX', 'HU', 'VV', 'RE'
'36', 'OC', 'PU', 'SK', 'MF', 'OI', 'OM', 'DD', 'DB', 'ST', 'BL', 'IV', 'FM', 'C1', 'AL', 'SA', 'SB', 'FR', 'WP', 'HA', 'NX', 'HU', 'VV', 'RE', 'CB', 'MZ', 'UM', 'FK', 'FX', 'WI', 'MN', 'M1', 'AH', 'SU', 'EU', 'EZ', 'UT', 'DT', 'S0'
);

/**
Expand Down
Loading

0 comments on commit d1f13ba

Please sign in to comment.