Backport Motorola Edge Fix

donatj · Jun 8, 2022 · 9851da5 · 9851da5
1 parent ce2b7df
commit 9851da5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/UserAgentParser.php b/src/UserAgentParser.php
@@ -63,13 +63,13 @@ function parse_user_agent( $u_agent = null ) {
 	}
 
 	preg_match_all('%(?P<browser>Camino|Kindle(\ Fire)?|Firefox|Iceweasel|IceCat|Safari|MSIE|Trident|AppleWebKit|
-				TizenBrowser|(?:Headless)?Chrome|YaBrowser|Vivaldi|IEMobile|Opera|OPR|Silk|Midori|Edge|EdgA?|CriOS|UCBrowser|Puffin|
+				TizenBrowser|(?:Headless)?Chrome|YaBrowser|Vivaldi|IEMobile|Opera|OPR|Silk|Midori|(?-i:Edge)|EdgA?|CriOS|UCBrowser|Puffin|
 				OculusBrowser|SamsungBrowser|SailfishBrowser|XiaoMi/MiuiBrowser|
 				Baiduspider|Applebot|Facebot|Googlebot|YandexBot|bingbot|Lynx|Version|Wget|curl|
 				Valve\ Steam\ Tenfoot|
 				NintendoBrowser|PLAYSTATION\ (\d|Vita)+)
 				(?:\)?;?)
-				(?:(?:[:/ ])(?P<version>[0-9A-Z.]+)|/(?:[A-Z]*))%ix',
+				(?:(?:[:/ ])(?P<version>[\dA-Z.]+)|/(?:[A-Z]*))%ix',
 		$u_agent, $result);
 
 	// If nothing matched, return null (to avoid undefined index errors)

diff --git a/tests/user_agents.dist.json b/tests/user_agents.dist.json
@@ -624,6 +624,11 @@
 		"browser": "Chrome",
 		"version": "18.0.1025.308"
 	},
+	"Mozilla\/5.0 (Linux; Android 11; motorola edge 20 lite) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/102.0.5005.78 Mobile Safari\/537.36": {
+		"platform": "Android",
+		"browser": "Chrome",
+		"version": "102.0.5005.78"
+	},
 	"Mozilla\/5.0 (Windows Mobile 10; Android 10.0; Microsoft; Lumia 950XL) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/100.0.4896.127 Mobile Safari\/537.36 Edge\/40.15254.603": {
 		"platform": "Android",
 		"browser": "Edge",