Merge pull request #17 from udemy/master

Handle some edge cases for IE11

Author: gabrielbull

src/Browser/BrowserDetector.php

@@ -144,7 +144,7 @@ private static function checkBrowserInternetExplorer(Browser $browser, UserAgent
                 $browser->setVersion('1.5');
             }
             return true;
-        } // Test for versions > 1.5 and < 11
+        } // Test for versions > 1.5 and < 11 and some cases of 11
         else if (stripos($userAgent->getUserAgentString(), 'msie') !== false && stripos($userAgent->getUserAgentString(), 'opera') === false) {
             // See if the browser is the odd MSN Explorer
             if (stripos($userAgent->getUserAgentString(), 'msnb') !== false) {
@@ -156,6 +156,14 @@ private static function checkBrowserInternetExplorer(Browser $browser, UserAgent
             $aresult = explode(' ', stristr(str_replace(';', '; ', $userAgent->getUserAgentString()), 'msie'));
             $browser->setName($browser::IE);
             $browser->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
+            // See https://msdn.microsoft.com/en-us/library/ie/hh869301%28v=vs.85%29.aspx 
+            // Might be 11, anyway !
+            if (stripos($userAgent->getUserAgentString(), 'trident') !== false) {
+                preg_match('/rv:(\d+\.\d+)/', $userAgent->getUserAgentString(), $matches);
+                if (isset($matches[1])) {
+                    $browser->setVersion($matches[1]);
+                }
+            }
             return true;
         } // Test for versions >= 11
         else if (stripos($userAgent->getUserAgentString(), 'trident') !== false) {

tests/Browser/Tests/BrowserTest.php

@@ -26,6 +26,14 @@ public function testInternetExplorer11()
         $browser = new Browser("Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko");
         $this->assertEquals(Browser::IE, $browser->getName());
         $this->assertEquals('11.0', $browser->getVersion());
+
+        $browser = new Browser("Mozilla/5.0 (MSIE 9.0; Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko");
+        $this->assertEquals(Browser::IE, $browser->getName());
+        $this->assertEquals('11.0', $browser->getVersion());
+
+        $browser = new Browser("Mozilla/5.0 (MSIE 9.0; Windows NT 6.3; WOW64; Trident/7.0;) like Gecko");
+        $this->assertEquals(Browser::IE, $browser->getName());
+        $this->assertEquals('9.0', $browser->getVersion());
     }
 
     public function testSeaMonkey()