Skip to content

Commit 37e645c

Browse files
liviuconcioiuliviuconcioiu
committed
Merge remote-tracking branch 'upstream/master' into 8255
2 parents c4d7659 + c6a7670 commit 37e645c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+441
-417
lines changed

‎Parser/Device/AbstractDeviceParser.php‎

Lines changed: 66 additions & 40 deletions
Large diffs are not rendered by default.

‎Tests/fixtures/bots.yml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,9 +1511,9 @@
15111511
-
15121512
user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.96 Mobile Safari/537.36 (compatible; Google-Read-Aloud; +https://support.google.com/webmasters/answer/1061943)
15131513
bot:
1514-
name: Googlebot
1515-
category: Search bot
1516-
url: https://developers.google.com/search/docs/crawling-indexing/overview-google-crawlers
1514+
name: Google-Read-Aloud
1515+
category: Crawler
1516+
url: https://developers.google.com/crawling/docs/crawlers-fetchers/read-aloud-user-agent
15171517
producer:
15181518
name: Google Inc.
15191519
url: https://www.google.com/
@@ -10095,6 +10095,24 @@
1009510095
producer:
1009610096
name: Yahoo! Japan Corp.
1009710097
url: https://www.yahoo.co.jp/
10098+
-
10099+
user_agent: Mozilla/5.0 (compatible; Google-Site-Verification/1.0)
10100+
bot:
10101+
name: Google-Site-Verification
10102+
category: Validator
10103+
url: 'https://developers.google.com/crawling/docs/crawlers-fetchers/google-user-triggered-fetchers#google_site_verifier'
10104+
producer:
10105+
name: Google Inc.
10106+
url: https://www.google.com/
10107+
-
10108+
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Mobile Safari/537.36 (compatible; Google-Read-Aloud; +https://support.google.com/webmasters/answer/1061943)
10109+
bot:
10110+
name: Google-Read-Aloud
10111+
category: Crawler
10112+
url: https://developers.google.com/crawling/docs/crawlers-fetchers/read-aloud-user-agent
10113+
producer:
10114+
name: Google Inc.
10115+
url: https://www.google.com/
1009810116
-
1009910117
user_agent: 'IMPORTANT! FREE! NON-CRIMINAL BLOCKCHAIN PHP NEURAL NETWORK! OWN CRYPTO, GIFT, CAPITALIST AND BLOCKCHAIN SCIENTIFIC DEBT GATEWAYS! OWN HOSTING AND ENCRYPTED DATABASE! LINK - http://78.29.51.27/phpneuralnetwork/?s1=CU_example.com'
1010010118
bot:

‎Tests/fixtures/car_browser.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@
625625
engine_version: 110.0.0.0
626626
device:
627627
type: car browser
628-
brand: ROiK
629-
model: "10"
628+
brand: KAP
629+
model: ROiK-10
630630
os_family: Android
631631
browser_family: Chrome
632632
-

‎Tests/fixtures/desktop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8536,7 +8536,7 @@
85368536
engine_version: 103.0.0.0
85378537
device:
85388538
type: desktop
8539-
brand: Wanmukang
8539+
brand: Zhongyu Display
85408540
model: ZC-339
85418541
os_family: Android
85428542
browser_family: Chrome

‎Tests/fixtures/feature_phone.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2775,8 +2775,8 @@
27752775
engine_version: "48.0"
27762776
device:
27772777
type: feature phone
2778-
brand: Digit4G
2779-
model: Bold
2778+
brand: Digit
2779+
model: Digit4G Bold
27802780
os_family: Firefox OS
27812781
browser_family: Firefox
27822782
-
@@ -2793,8 +2793,8 @@
27932793
engine_version: "48.0"
27942794
device:
27952795
type: feature phone
2796-
brand: Digit4G
2797-
model: Defender
2796+
brand: Digit
2797+
model: Digit4G Defender
27982798
os_family: Firefox OS
27992799
browser_family: Firefox
28002800
-
@@ -2811,8 +2811,8 @@
28112811
engine_version: "48.0"
28122812
device:
28132813
type: feature phone
2814-
brand: Digit4G
2815-
model: Elite
2814+
brand: Digit
2815+
model: Digit4G Elite
28162816
os_family: Firefox OS
28172817
browser_family: Firefox
28182818
-
@@ -2829,8 +2829,8 @@
28292829
engine_version: "48.0"
28302830
device:
28312831
type: feature phone
2832-
brand: Digit4G
2833-
model: Music
2832+
brand: Digit
2833+
model: Digit4G Music
28342834
os_family: Firefox OS
28352835
browser_family: Firefox
28362836
-
@@ -2847,8 +2847,8 @@
28472847
engine_version: "48.0"
28482848
device:
28492849
type: feature phone
2850-
brand: Digit4G
2851-
model: Power
2850+
brand: Digit
2851+
model: Digit4G Power
28522852
os_family: Firefox OS
28532853
browser_family: Firefox
28542854
-
@@ -2865,8 +2865,8 @@
28652865
engine_version: "48.0"
28662866
device:
28672867
type: feature phone
2868-
brand: Digit4G
2869-
model: Star
2868+
brand: Digit
2869+
model: Digit4G Star
28702870
os_family: Firefox OS
28712871
browser_family: Firefox
28722872
-
@@ -2883,8 +2883,8 @@
28832883
engine_version: "48.0"
28842884
device:
28852885
type: feature phone
2886-
brand: Digit4G
2887-
model: Lite
2886+
brand: Digit
2887+
model: Digit4G Lite
28882888
os_family: Firefox OS
28892889
browser_family: Firefox
28902890
-
@@ -2901,8 +2901,8 @@
29012901
engine_version: "48.0"
29022902
device:
29032903
type: feature phone
2904-
brand: Digit4G
2905-
model: Power Max
2904+
brand: Digit
2905+
model: Digit4G Power Max
29062906
os_family: Firefox OS
29072907
browser_family: Firefox
29082908
-
@@ -2919,8 +2919,8 @@
29192919
engine_version: "48.0"
29202920
device:
29212921
type: feature phone
2922-
brand: Digit4G
2923-
model: Shine
2922+
brand: Digit
2923+
model: Digit4G Shine
29242924
os_family: Firefox OS
29252925
browser_family: Firefox
29262926
-

‎Tests/fixtures/phablet-1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2811,8 +2811,8 @@
28112811
engine_version: 86.0.4240.110
28122812
device:
28132813
type: phablet
2814-
brand: P-UP
2815-
model: Mode 1 RR
2814+
brand: Mode 1
2815+
model: RR
28162816
os_family: Android
28172817
browser_family: Chrome
28182818
-

‎Tests/fixtures/phablet.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6220,8 +6220,8 @@
62206220
engine_version: 86.0.4240.185
62216221
device:
62226222
type: phablet
6223-
brand: P-UP
6224-
model: Mode 1 RS
6223+
brand: Mode 1
6224+
model: RS
62256225
os_family: Android
62266226
browser_family: Chrome
62276227
-

‎Tests/fixtures/smartphone-11.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6774,7 +6774,7 @@
67746774
engine_version: 78.0.3904.96
67756775
device:
67766776
type: smartphone
6777-
brand: RoverPad
6777+
brand: Rover Computers
67786778
model: ""
67796779
os_family: Android
67806780
browser_family: Chrome

‎Tests/fixtures/smartphone-12.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621
engine_version: 43.0.2357.92
622622
device:
623623
type: smartphone
624-
brand: Star
624+
brand: Kingelon
625625
model: N8800
626626
os_family: Android
627627
browser_family: Chrome
@@ -639,7 +639,7 @@
639639
engine_version: 40.0.2214.109
640640
device:
641641
type: smartphone
642-
brand: Star
642+
brand: Kingelon
643643
model: N9500
644644
os_family: Android
645645
browser_family: Chrome
@@ -657,7 +657,7 @@
657657
engine_version: "534.30"
658658
device:
659659
type: smartphone
660-
brand: Star
660+
brand: Kingelon
661661
model: N9600
662662
os_family: Android
663663
browser_family: Android Browser
@@ -675,7 +675,7 @@
675675
engine_version: 34.0.1847.114
676676
device:
677677
type: smartphone
678-
brand: Star
678+
brand: Kingelon
679679
model: N9700
680680
os_family: Android
681681
browser_family: Chrome
@@ -693,7 +693,7 @@
693693
engine_version: "534.30"
694694
device:
695695
type: smartphone
696-
brand: Star
696+
brand: Kingelon
697697
model: N9800
698698
os_family: Android
699699
browser_family: Android Browser
@@ -711,7 +711,7 @@
711711
engine_version: "534.30"
712712
device:
713713
type: smartphone
714-
brand: Star
714+
brand: Kingelon
715715
model: N9977
716716
os_family: Android
717717
browser_family: Android Browser
@@ -729,8 +729,9 @@
729729
engine_version: 30.0.0.0
730730
device:
731731
type: smartphone
732-
brand: Star
733-
model: Note 3
732+
brand: Kingelon
733+
#Previously "Note 3", probably because this is Samsung Note 3 clone, but officially it's N9000. Similar model was released as "Note 3" under 5Star brand
734+
model: N9000
734735
os_family: Android
735736
browser_family: Chrome
736737
-
@@ -10783,8 +10784,8 @@
1078310784
engine_version: 104.0.0.0
1078410785
device:
1078510786
type: smartphone
10786-
brand: Digit4G
10787-
model: Play1
10787+
brand: Digit
10788+
model: Digit4G Play1
1078810789
os_family: Android
1078910790
browser_family: Chrome
1079010791
-

‎Tests/fixtures/smartphone-15.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9532,8 +9532,9 @@
95329532
engine_version: 103.0.0.0
95339533
device:
95349534
type: smartphone
9535-
brand: H133
9536-
model: Betacrux
9535+
brand: Ceibal
9536+
#https://ceibal.edu.uy/institucional/articulos/hardware-beta-crux/
9537+
model: H133 Beta Crux
95379538
os_family: Android
95389539
browser_family: Chrome
95399540
-

0 commit comments

Comments
 (0)