introduce driver version aliases; change version polling output parser pattern type to regex; try polling version with multiple path schemes on Windows

Author: Allan Paiste

changelog.json

@@ -1,4 +1,13 @@
 {
+    "2.0.0": {
+        "breaking": [
+            "(config) version polling output parser switched to use refex pattern matching instead of relying on sscanf"
+        ],
+        "feature": [
+            "allow driver version polling to use version aliases (required for some drivers that use multiple versioning schemes (like EdgeDriver))",
+            "try version polling with escaped path on Windows if normal call results in blank response"
+        ]
+    },
     "1.0.0": {
         "feature": [
             "allow webdriver binary download based on passed-in configuration"

src/Analysers/ProjectAnalyser.php

@@ -6,6 +6,7 @@
 namespace Vaimo\WebDriverBinaryDownloader\Analysers;
 
 use Vaimo\WebDriverBinaryDownloader\Interfaces\ConfigInterface;
+use Vaimo\WebDriverBinaryDownloader\Interfaces\PlatformAnalyserInterface as Platform;
 
 class ProjectAnalyser
 {
@@ -89,13 +90,38 @@ public function resolveInstalledDriverVersion($binaryDir)
         }
 
         $executableName = $executableNames[$platformCode];
-
-        $driverPath = realpath($this->utils->composePath($binaryDir, $executableName));
+        $executableRenames = $this->pluginConfig->getExecutableFileRenames();
+        
+        $driverPath = realpath(
+            $this->utils->composePath($binaryDir, $executableRenames[$executableName] ?? $executableName)
+        );
+        
+        $binaries = [$driverPath];
 
-        return $this->versionResolver->pollForVersion(
-            [$driverPath],
+        if ($platformCode === Platform::TYPE_WIN64 || $platformCode === Platform::TYPE_WIN32) {
+            $binaries = array_merge($binaries, array_map(function ($item) {
+                return str_replace('\\', '\\\\', $item);
+            }, $binaries));
+        }
+        
+        $installedVersion = $this->versionResolver->pollForVersion(
+            $binaries,
             $this->pluginConfig->getDriverVersionPollingConfig()
         );
+        
+        $versionMap = $this->pluginConfig->getBrowserDriverVersionMap();
+
+        foreach ($versionMap as $driverVersion) {
+            if (!is_array($driverVersion)) {
+                $driverVersion = [$driverVersion];
+            }
+            
+            if (in_array($installedVersion, $driverVersion)) {
+                $installedVersion = reset($driverVersion);
+            }  
+        }
+
+        return $installedVersion;
     }
 
     public function resolveRequiredDriverVersion()
@@ -118,7 +144,11 @@ public function resolveRequiredDriverVersion()
 
             if (!$version) {
                 $versionMap = array_filter($this->pluginConfig->getBrowserDriverVersionMap());
-                $version = reset($versionMap);   
+                $version = reset($versionMap);
+                
+                if (is_array($version)) {
+                    $version = reset($version);
+                }
             }
         }
 
@@ -148,7 +178,7 @@ private function resolveBrowserDriverVersion($browserVersion)
                 continue;
             }
 
-            return $driverVersion;
+            return is_array($driverVersion) ? reset($driverVersion) : $driverVersion;
         }
 
         return '';

src/Installer/VersionResolver.php

@@ -30,26 +30,31 @@ public function pollForVersion(array $binaryPaths, array $versionPollingConfig)
         $processExecutor::setTimeout(10);
 
         foreach ($binaryPaths as $path) {
-            if (!is_executable($path)) {
+            if ($path !== null && !is_executable($path)) {
                 continue;
             }
 
             foreach ($versionPollingConfig as $callTemplate => $resultPatterns) {
                 $output = '';
 
-                $processExecutor->execute(sprintf($callTemplate, $path), $output);
+                $pollCommand = sprintf($callTemplate, $path);
+                $processExecutor->execute($pollCommand, $output);
 
-                $output = trim($output);
+                $output = str_replace(chr(0), '', trim($output));
+                
+                if (!$output) {
+                    continue;
+                }
 
                 foreach ($resultPatterns as $pattern) {
-                    $matches = sscanf($output, $pattern);
+                    preg_match(sprintf('/%s/i', $pattern), $output, $matches);
+
+                    $result = $matches[1] ?? false;
 
-                    if (!is_array($matches) || !$matches) {
+                    if (!$result) {
                         continue;
                     }
-
-                    $result = reset($matches);
-
+                    
                     try {
                         $this->versionParser->parseConstraints($result);
                     } catch (\UnexpectedValueException $exception) {