From 72077ff86c2e901954e53fe6c90e4a7a2894c305 Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Fri, 4 Aug 2023 09:25:30 +0200
Subject: [PATCH] Split inheritReadOptions method

---
 src/Collection.php | 58 +++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/Collection.php b/src/Collection.php
index b746ea235..233fdc10d 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -213,9 +213,7 @@ public function aggregate(array $pipeline, array $options = [])
     {
         $hasWriteStage = is_last_pipeline_operator_write($pipeline);
 
-        if (! isset($options['readPreference']) && ! is_in_transaction($options)) {
-            $options['readPreference'] = $this->readPreference;
-        }
+        $options = $this->inheritReadPreference($options);
 
         $server = $hasWriteStage
             ? select_server_for_aggregate_write_stage($this->manager, $options)
@@ -223,15 +221,9 @@ public function aggregate(array $pipeline, array $options = [])
 
         /* MongoDB 4.2 and later supports a read concern when an $out stage is
          * being used, but earlier versions do not.
-         *
-         * A read concern is also not compatible with transactions.
          */
-        if (
-            ! isset($options['readConcern']) &&
-            ! is_in_transaction($options) &&
-            ( ! $hasWriteStage || server_supports_feature($server, self::WIRE_VERSION_FOR_READ_CONCERN_WITH_WRITE_STAGE))
-        ) {
-            $options['readConcern'] = $this->readConcern;
+        if (! $hasWriteStage || server_supports_feature($server, self::WIRE_VERSION_FOR_READ_CONCERN_WITH_WRITE_STAGE)) {
+            $options = $this->inheritReadConcern($options);
         }
 
         $options = $this->inheritCodecOrTypeMap($options);
@@ -543,10 +535,7 @@ public function estimatedDocumentCount(array $options = [])
      */
     public function explain(Explainable $explainable, array $options = [])
     {
-        if (! isset($options['readPreference']) && ! is_in_transaction($options)) {
-            $options['readPreference'] = $this->readPreference;
-        }
-
+        $options = $this->inheritReadPreference($options);
         $options = $this->inheritTypeMap($options);
 
         $operation = new Explain($this->databaseName, $explainable, $options);
@@ -842,22 +831,18 @@ public function mapReduce(JavascriptInterface $map, JavascriptInterface $reduce,
     {
         $hasOutputCollection = ! is_mapreduce_output_inline($out);
 
-        if (! isset($options['readPreference']) && ! is_in_transaction($options)) {
-            $options['readPreference'] = $this->readPreference;
-        }
-
         // Check if the out option is inline because we will want to coerce a primary read preference if not
         if ($hasOutputCollection) {
             $options['readPreference'] = new ReadPreference(ReadPreference::PRIMARY);
+        } else {
+            $options = $this->inheritReadPreference($options);
         }
 
         /* A "majority" read concern is not compatible with inline output, so
          * avoid providing the Collection's read concern if it would conflict.
-         *
-         * A read concern is also not compatible with transactions.
          */
-        if (! isset($options['readConcern']) && ! ($hasOutputCollection && $this->readConcern->getLevel() === ReadConcern::MAJORITY) && ! is_in_transaction($options)) {
-            $options['readConcern'] = $this->readConcern;
+        if (! $hasOutputCollection || $this->readConcern->getLevel() !== ReadConcern::MAJORITY) {
+            $options = $this->inheritReadConcern($options);
         }
 
         $options = $this->inheritWriteOptions($options);
@@ -1035,22 +1020,33 @@ private function inheritCodecOrTypeMap(array $options): array
         return $options;
     }
 
-    private function inheritReadOptions(array $options): array
+    private function inheritReadConcern(array $options): array
     {
         // ReadConcern and ReadPreference may not change within a transaction
-        if (! is_in_transaction($options)) {
-            if (! isset($options['readConcern'])) {
-                $options['readConcern'] = $this->readConcern;
-            }
+        if (! isset($options['readConcern']) && ! is_in_transaction($options)) {
+            $options['readConcern'] = $this->readConcern;
+        }
 
-            if (! isset($options['readPreference'])) {
-                $options['readPreference'] = $this->readPreference;
-            }
+        return $options;
+    }
+
+    private function inheritReadPreference(array $options): array
+    {
+        // ReadConcern and ReadPreference may not change within a transaction
+        if (! isset($options['readPreference']) && ! is_in_transaction($options)) {
+            $options['readPreference'] = $this->readPreference;
         }
 
         return $options;
     }
 
+    private function inheritReadOptions(array $options): array
+    {
+        $options = $this->inheritReadConcern($options);
+
+        return $this->inheritReadPreference($options);
+    }
+
     private function inheritTypeMap(array $options): array
     {
         // Only inherit the type map if no codec is used