From 34f76a79d714f6eb25d0cd9f1a46a11fd91b7686 Mon Sep 17 00:00:00 2001
From: YJSoft <yjsoft@yjsoft.xyz>
Date: Fri, 15 Oct 2021 10:48:16 +0900
Subject: [PATCH] Fix #1811 Add chromium edge detection to getBrowserInfo

---
 common/framework/ua.php         |  2 +-
 tests/unit/framework/UATest.php | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/common/framework/ua.php b/common/framework/ua.php
index 26e45ddc4..c1b63869a 100644
--- a/common/framework/ua.php
+++ b/common/framework/ua.php
@@ -275,7 +275,7 @@ class UA
 				return $result;
 			}
 		}
-		if (preg_match('#Edge/([0-9]+\\.)#', $ua, $matches))
+		if (preg_match('#Edg(?:e|A|iOS)?/([0-9]+\\.)#', $ua, $matches))
 		{
 			$result->browser = 'Edge';
 			$result->version = $matches[1] . '0';
diff --git a/tests/unit/framework/UATest.php b/tests/unit/framework/UATest.php
index b24b218e7..d80070cd6 100644
--- a/tests/unit/framework/UATest.php
+++ b/tests/unit/framework/UATest.php
@@ -120,6 +120,27 @@ class UATest extends \Codeception\TestCase\Test
 		$this->assertEquals('4.9', $browser->version);
 		$this->assertEquals('Linux', $browser->os);
 		
+		// Edge 94 on Windows
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36 Edg/94.0.992.47');
+		$this->assertEquals('Edge', $browser->browser);
+		$this->assertEquals('94.0', $browser->version);
+		$this->assertEquals('Windows', $browser->os);
+		$this->assertFalse($browser->is_mobile);
+		
+		// Edge 93 on Android
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Linux; Android 10; SM-G965N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 Mobile Safari/537.36 EdgA/93.0.961.69');
+		$this->assertEquals('Edge', $browser->browser);
+		$this->assertEquals('93.0', $browser->version);
+		$this->assertEquals('Android', $browser->os);
+		$this->assertTrue($browser->is_mobile);
+		
+		// Edge 93 on iOS
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (iPhone; CPU iPhone OS 15_0_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.0 EdgiOS/93.961.64 Mobile/15E148 Safari/605.1.15');
+		$this->assertEquals('Edge', $browser->browser);
+		$this->assertEquals('93.0', $browser->version);
+		$this->assertEquals('iOS', $browser->os);
+		$this->assertTrue($browser->is_mobile);
+		
 		// Edge 13
 		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/13.10586');
 		$this->assertEquals('Edge', $browser->browser);