[3.x] Fix browser and engine detection of web client (#132)

Author: richard67

Tests/Web/WebClientTest.php

@@ -30,6 +30,14 @@ public static function getUserAgentData()
     {
         // Platform, Mobile, Engine, Browser, Version, User Agent
         return [
+            [
+                '',
+                false,
+                '',
+                '',
+                '',
+                null,
+            ],
             [
                 WebClient::WINDOWS,
                 false,
@@ -150,6 +158,14 @@ public static function getUserAgentData()
                 '54.0.2840.71',
                 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36',
             ],
+            [
+                WebClient::WINDOWS,
+                false,
+                WebClient::BLINK,
+                WebClient::CHROME,
+                '131.0.0.0',
+                'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+            ],
             [
                 WebClient::LINUX,
                 false,
@@ -350,6 +366,38 @@ public static function getUserAgentData()
                 '75.0.107.0',
                 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3738.0 Safari/537.36 Edg/75.0.107.0',
             ],
+            [
+                '',
+                false,
+                WebClient::BLINK,
+                WebClient::CHROME,
+                '',
+                'Chrome Privacy Preserving Prefetch Proxy',
+            ],
+            [
+                '',
+                false,
+                WebClient::BLINK,
+                WebClient::CHROME,
+                '',
+                'Chrome',
+            ],
+            [
+                '',
+                false,
+                WebClient::WEBKIT,
+                '',
+                '',
+                'AppleWebKit',
+            ],
+            [
+                '',
+                false,
+                WebClient::BLINK,
+                '',
+                '',
+                'AppleWebKit/537.36',
+            ],
         ];
     }
 

src/Web/WebClient.php

@@ -287,6 +287,14 @@ protected function detectBrowser($userAgent)
             return;
         }
 
+        // Check for Google's Private Prefetch Proxy
+        if ($userAgent === 'Chrome Privacy Preserving Prefetch Proxy') {
+            // Private Prefetch Proxy does not provide any further details like e.g. version
+            $this->browser = self::CHROME;
+
+            return;
+        }
+
         $patternBrowser = '';
 
         // Attempt to detect the browser type.  Obviously we are only worried about major browsers.
@@ -394,27 +402,32 @@ protected function detectEngine($userAgent)
         } elseif (\stripos($userAgent, 'Edg') !== false) {
             $this->engine = self::BLINK;
         } elseif (\stripos($userAgent, 'Chrome') !== false) {
-            $result  = \explode('/', \stristr($userAgent, 'Chrome'));
-            $version = \explode(' ', $result[1]);
+            $this->engine = self::BLINK;
 
-            if ($version[0] >= 28) {
-                $this->engine = self::BLINK;
-            } else {
-                $this->engine = self::WEBKIT;
+            $result = \explode('/', \stristr($userAgent, 'Chrome'));
+
+            if (isset($result[1])) {
+                $version = \explode(' ', $result[1]);
+
+                if (version_compare($version[0], '28.0', 'lt')) {
+                    $this->engine = self::WEBKIT;
+                }
             }
         } elseif (\stripos($userAgent, 'AppleWebKit') !== false || \stripos($userAgent, 'blackberry') !== false) {
+            $this->engine = self::WEBKIT;
+
             if (\stripos($userAgent, 'AppleWebKit') !== false) {
-                $result  = \explode('/', \stristr($userAgent, 'AppleWebKit'));
-                $version = \explode(' ', $result[1]);
+                $result = \explode('/', \stristr($userAgent, 'AppleWebKit'));
 
-                if ($version[0] === 537.36) {
-                    // AppleWebKit/537.36 is Blink engine specific, exception is Blink emulated IEMobile, Trident or Edge
-                    $this->engine = self::BLINK;
+                if (isset($result[1])) {
+                    $version = \explode(' ', $result[1]);
+
+                    if ($version[0] === '537.36') {
+                        // AppleWebKit/537.36 is Blink engine specific, exception is Blink emulated IEMobile, Trident or Edge
+                        $this->engine = self::BLINK;
+                    }
                 }
             }
-
-            // Evidently blackberry uses WebKit and doesn't necessarily report it.  Bad RIM.
-            $this->engine = self::WEBKIT;
         } elseif (\stripos($userAgent, 'Gecko') !== false && \stripos($userAgent, 'like Gecko') === false) {
             // We have to check for like Gecko because some other browsers spoof Gecko.
             $this->engine = self::GECKO;