PHPLIB-680: Topology match should not preempt later checks

Author: jmikola

tests/UnifiedSpecTests/RunOnRequirement.php

@@ -92,17 +92,7 @@ public function isSatisfied(string $serverVersion, string $topology, stdClass $s
             return false;
         }
 
-        if (isset($this->topologies)) {
-            if (in_array($topology, $this->topologies)) {
-                return true;
-            }
-
-            /* Ensure "sharded-replicaset" is also accepted for topologies that
-             * only include "sharded" (agnostic about the shard topology) */
-            if ($topology === self::TOPOLOGY_SHARDED_REPLICASET && in_array(self::TOPOLOGY_SHARDED, $this->topologies)) {
-                return true;
-            }
-
+        if (isset($this->topologies) && ! $this->isTopologySatisfied($topology)) {
             return false;
         }
 
@@ -119,4 +109,19 @@ public function isSatisfied(string $serverVersion, string $topology, stdClass $s
 
         return true;
     }
+
+    private function isTopologySatisfied(string $topology) : bool
+    {
+        if (in_array($topology, $this->topologies)) {
+            return true;
+        }
+
+        /* Ensure "sharded-replicaset" is also accepted for topologies that
+         * only include "sharded" (agnostic about the shard topology) */
+        if ($topology === self::TOPOLOGY_SHARDED_REPLICASET && in_array(self::TOPOLOGY_SHARDED, $this->topologies)) {
+            return true;
+        }
+
+        return false;
+    }
 }