PHPLIB-634 Ignore pre-release flags in server version numbers (#823)

Author: alcaeus

tests/FunctionalTestCase.php

@@ -282,17 +282,14 @@ protected function getPrimaryServer()
 
     protected function getServerVersion(ReadPreference $readPreference = null)
     {
-        $cursor = $this->manager->executeCommand(
+        $buildInfo = $this->manager->executeCommand(
             $this->getDatabaseName(),
             new Command(['buildInfo' => 1]),
             $readPreference ?: new ReadPreference(ReadPreference::RP_PRIMARY)
-        );
-
-        $cursor->setTypeMap(['root' => 'array', 'document' => 'array']);
-        $document = current($cursor->toArray());
+        )->toArray()[0];
 
-        if (isset($document['version']) && is_string($document['version'])) {
-            return preg_replace('#^(\d+\.\d+\.\d+).*$#', '\1', $document['version']);
+        if (isset($buildInfo->version) && is_string($buildInfo->version)) {
+            return preg_replace('#^(\d+\.\d+\.\d+).*$#', '\1', $buildInfo->version);
         }
 
         throw new UnexpectedValueException('Could not determine server version');

tests/UnifiedSpecTests/UnifiedTestRunner.php

@@ -25,6 +25,7 @@
 use function PHPUnit\Framework\assertIsString;
 use function PHPUnit\Framework\assertNotEmpty;
 use function preg_match;
+use function preg_replace;
 use function sprintf;
 use function strpos;
 use function version_compare;
@@ -332,7 +333,7 @@ private function getServerVersion() : string
         $buildInfo = $database->command(['buildInfo' => 1])->toArray()[0];
 
         if (isset($buildInfo->version) && is_string($buildInfo->version)) {
-            return $buildInfo->version;
+            return preg_replace('#^(\d+\.\d+\.\d+).*$#', '\1', $buildInfo->version);
         }
 
         throw new UnexpectedValueException('Could not determine server version');