Merge pull request #139 from mpetty/fix-version-merge-rules

Fixed bug when testing browser version for Opera or IE #138
jenssegers · Jan 19, 2019 · bcb8953 · bcb8953
2 parents 41cd1fd + ac5bfef
commit bcb8953
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Agent.php b/src/Agent.php
@@ -320,6 +320,10 @@ public function version($propertyName, $type = self::VERSION_TYPE_STRING)
             $properties[$propertyName] = (array) $properties[$propertyName];
 
             foreach ($properties[$propertyName] as $propertyMatchString) {
+                if (is_array($propertyMatchString)) {
+                    $propertyMatchString = implode("|", $propertyMatchString);
+                }
+
                 $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
 
                 // Identify and extract the version.

diff --git a/tests/AgentTest.php b/tests/AgentTest.php
@@ -222,6 +222,11 @@ public function testVersions()
             $platform = $agent->platform();
             $this->assertEquals($version, $agent->version($platform), $ua);
         }
+
+        foreach ($this->browsers as $ua => $browser) {
+            $agent->setUserAgent('FAKE');
+            $this->assertFalse($agent->version($browser));
+        }
     }
 
     public function testIsMethods()