Version 2.2 (release)

MacOS Monterey and Windows 11 User-Agents detection

Author: foroco

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this `PHP Browser Detection` project documented in this file.
 
+## [2.2] - 2021-07-05
+
+### Added
+
+- MacOS Monterey detection added;
+- Windows 11 detection added.
+
 ## [2.1] - 2021-04-06
 
 ### Changed

README.md

@@ -6,6 +6,7 @@ Uses a simple and fast algorithm to accurately detect more than 165 browser type
 For most commonly browsers parsing process took less than 0.0005 second even on low-level shared hosting.\
 In the case of rare User-Agents recognized time is less than 0.0008 second for the same conditioned hosting environment.\
 The library supports only really actual Browsers and OS without support for outdated environments that are actually not used now.\
+Newest MacOS Monterey and Windows 11 User-Agents detection included.\
 Works by use only one library file and without any third-party libraries dependency.
 
 ## Requirements

src/BrowserDetection.php

@@ -25,8 +25,8 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 * 
-* @version 2.1
-* @last-modified April 6, 2021
+* @version 2.2
+* @last-modified July 5, 2021
 * @link https://github.com/foroco/php-browser-detection
 */
 
@@ -245,6 +245,7 @@ private function macos_codename($version)
 			case 14: $result_codename = 'Mojave'; break;
 			case 15: $result_codename = 'Catalina'; break;
 			case 16: $result_codename = 'Big Sur'; break;
+			case 17: $result_codename = 'Monterey'; break;
 			default: $result_codename = 'New'; break;
 		}
 		return $result_codename;
@@ -314,6 +315,8 @@ private function getResult()
 			$this->result_os_name = 'Windows';
 			$matches = $this->match_ua('/Windows ([ .a-zA-Z0-9]+)[;\\)]/');
 			$version = is_array($matches) ? $matches[1] : 0;
+			if ($version === 'NT 11.0') $this->result_os_version = '11';
+			if ($version === 'NT 10.1') $this->result_os_version = '11';
 			if ($version === 'NT 10.0') $this->result_os_version = '10';
 			if ($version === 'NT 6.4') $this->result_os_version = '10';
 			if ($version === 'NT 6.3') $this->result_os_version = '8.1';
@@ -372,10 +375,13 @@ private function getResult()
 					$version = is_array($matches) ? $matches[1] : 0;
 					$version_minor = is_array($matches) ? $matches[2] : 0;
 
+					// macOS version to minor version conversion (needs since Big Sur)
 					if ($version == 11) $version_minor = 16;
+					if ($version == 12) $version_minor = 17;
+					
 					if (!empty($version_minor))
 					{
-						if ($version == 10 || $version == 11) $this->result_os_version = $this->macos_codename($version_minor);
+						if ($version >= 10) $this->result_os_version = $this->macos_codename($version_minor);
 						$this->macos_version_minor = $version_minor;
 					}
 

tests/v2.2.php

@@ -0,0 +1,38 @@
+<?php
+
+require_once('../src/BrowserDetection.php');
+$Browser = new foroco\BrowserDetection();
+
+// Testing some new User-Agent strings
+
+$useragent[] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 12_0_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36';
+$useragent[] = 'Mozilla/5.0 (Windows NT 10.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36';
+$useragent[] = 'Mozilla/5.0 (Windows NT 11.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36';
+
+$time_start = microtime(true);
+
+foreach ($useragent as $u)
+{
+	// Detect all possible environment data from User-Agents
+	$result = $Browser->getAll($u);
+
+	echo '<div style="font-size:16px; font-weight:bold"><pre>';
+	echo $u;
+	echo '</pre></div>';
+
+	echo '<div style="font-size:18px; font-weight:bold"><pre>';
+	print_r($result);
+	echo '</pre></div>';
+
+	echo '<div style="font-size:16px; font-weight:bold"><pre>';
+	echo '--------------------------------------------------------------------------------';
+	echo '</pre></div>';
+
+}
+
+$time_end = microtime(true);
+$time_result = $time_end - $time_start;
+
+echo '<p style="font-size:21px">Total execution time: '.substr($time_result,0,7).' sec.</p>';
+
+?>