Fixes zendframework#550 - Zend_Http_UserAgent_AbstractDevice undefine…

…d index
tripsta · Jun 17, 2016 · f77b604 · f77b604
1 parent 4b976cf
commit f77b604
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/library/Zend/Http/UserAgent/AbstractDevice.php b/library/Zend/Http/UserAgent/AbstractDevice.php
@@ -509,7 +509,9 @@ public static function extractFromUserAgent($userAgent)
                 }
                 $result['browser_version'] = '??';
             }
-        } elseif ($product == 'mozilla' && $result['browser_version'] < 5.0) {
+        } elseif ($product == 'mozilla' && isset($result['browser_version'])
+                  && $result['browser_version'] < 5.0
+        ) {
             // handles the real Mozilla (or old Netscape if version < 5.0)
             $result['browser_name'] = 'Netscape';
         }

diff --git a/tests/Zend/Http/UserAgent/AbstractDeviceTest.php b/tests/Zend/Http/UserAgent/AbstractDeviceTest.php
@@ -10128,4 +10128,14 @@ public function testOperaOnHtcHd2UserAgentShouldNotResultInNotices()
         $capabilities = Zend_Http_UserAgent_AbstractDevice::extractFromUserAgent($userAgent);
         $this->assertEquals('Opera', $capabilities['browser_name']);
     }
+
+    /**
+     * @group GH-550
+     */
+    public function testOnlyBrowserNameShouldNotResultInNotices()
+    {
+        $userAgent    = 'Mozilla';
+        $capabilities = Zend_Http_UserAgent_AbstractDevice::extractFromUserAgent($userAgent);
+        $this->assertEquals('Mozilla', $capabilities['browser_name']);
+    }
 }