Remove helper functions now that Manager RP/WC getters exist

Author: jmikola

src/Client.php

@@ -75,8 +75,8 @@ public function listDatabases(array $options = array())
     public function selectCollection($databaseName, $collectionName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null)
     {
         $namespace = $databaseName . '.' . $collectionName;
-        $writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
-        $readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
+        $writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
+        $readPreference = $readPreference ?: $this->manager->getReadPreference();
 
         return new Collection($this->manager, $namespace, $writeConcern, $readPreference);
     }
@@ -94,8 +94,8 @@ public function selectCollection($databaseName, $collectionName, WriteConcern $w
      */
     public function selectDatabase($databaseName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null)
     {
-        $writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
-        $readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
+        $writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
+        $readPreference = $readPreference ?: $this->manager->getReadPreference();
 
         return new Database($this->manager, $databaseName, $writeConcern, $readPreference);
     }

src/Collection.php

@@ -66,8 +66,8 @@ public function __construct(Manager $manager, $namespace, WriteConcern $writeCon
         $this->collectionName = $parts[1];
 
         $this->manager = $manager;
-        $this->writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
-        $this->readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
+        $this->writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
+        $this->readPreference = $readPreference ?: $this->manager->getReadPreference();
     }
 
     /**

src/Database.php

@@ -44,8 +44,8 @@ public function __construct(Manager $manager, $databaseName, WriteConcern $write
 
         $this->manager = $manager;
         $this->databaseName = (string) $databaseName;
-        $this->writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
-        $this->readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
+        $this->writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
+        $this->readPreference = $readPreference ?: $this->manager->getReadPreference();
     }
 
     /**

src/functions.php

@@ -2,12 +2,8 @@
 
 namespace MongoDB;
 
-use MongoDB\Driver\Manager;
-use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\Server;
-use MongoDB\Driver\WriteConcern;
 use MongoDB\Exception\InvalidArgumentTypeException;
-use ReflectionClass;
 
 /**
  * Return whether the first key in the document starts with a "$" character.
@@ -57,69 +53,6 @@ function is_last_pipeline_operator_out(array $pipeline)
     return key($lastOp) === '$out';
 }
 
-/**
- * Returns a ReadPreference corresponding to the Manager's read preference.
- *
- * @internal
- * @todo this function can be removed once PHPC-417 is implemented
- * @param Manager $manager
- * @return ReadPreference
- */
-function get_manager_read_preference(Manager $manager)
-{
-    $rp = $manager->getReadPreference();
-
-    if ($rp instanceof ReadPreference) {
-        return $rp;
-    }
-
-    $args = array(
-        $rp['mode'],
-    );
-
-    if (isset($rp['tags'])) {
-        $args[] = $rp['tags'];
-    }
-
-    $rc = new ReflectionClass('MongoDB\Driver\ReadPreference');
-
-    return $rc->newInstanceArgs($args);
-}
-
-/**
- * Returns a WriteConcern corresponding to the Manager's write concern.
- *
- * @internal
- * @todo this function can be removed once PHPC-417 is implemented
- * @param Manager $manager
- * @return WriteConcern
- */
-function get_manager_write_concern(Manager $manager)
-{
-    $wc = $manager->getWriteConcern();
-
-    if ($wc instanceof WriteConcern) {
-        return $wc;
-    }
-
-    $args = array(
-        isset($wc['w']) ? $wc['w'] : -2,
-        $wc['wtimeout'],
-    );
-
-    if (isset($wc['journal'])) {
-        $args[] = $wc['journal'];
-
-        if (isset($wc['fsync'])) {
-            $args[] = $wc['fsync'];
-        }
-    }
-
-    $rc = new ReflectionClass('MongoDB\Driver\WriteConcern');
-
-    return $rc->newInstanceArgs($args);
-}
-
 /**
  * Generate an index name from a key specification.
  *