JM feedback

Author: norareidy

source/databases-collections.txt

@@ -45,6 +45,24 @@ The following example accesses a database named ``test_database``:
     :start-after: start-access-database
     :end-before: end-access-database
 
+Alternatively, you can implicitly call the ``MongoDB\Client::__get()`` magic method on
+a client object. This method allows you to select a database by using the syntax for
+accessing a class property. The following example uses this shorthand syntax to access
+the ``test_database`` database:
+
+.. literalinclude:: /includes/databases-collections/databases-collections.php
+    :language: php
+    :dedent:
+    :start-after: start-access-database-short
+    :end-before: end-access-database-short
+
+.. tip::
+
+   To learn more about ``__get()`` and PHP magic methods, see the following resources:
+
+   - :phpmethod:`MongoDB\Client::__get()` in the API documentation
+   - `Magic Methods <{+php-manual+}/language.oop5.magic.php>`__ in the PHP manual
+
 .. _php-db-coll-access-collection:
 
 Access a Collection
@@ -71,6 +89,20 @@ The following example accesses a collection named ``test_collection`` by using t
    MongoDB implicitly creates the collection when you first insert data
    into it.
 
+Alternatively, you can implicitly call the ``MongoDB\Database::__get()`` magic method on
+a database object. This method allows you to select a collection by using the syntax for
+accessing a class property. The following example uses this shorthand syntax to access
+the ``test_collection`` collection:
+
+.. literalinclude:: /includes/databases-collections/databases-collections.php
+    :language: php
+    :dedent:
+    :start-after: start-access-collection-short
+    :end-before: end-access-collection-short
+
+To learn more, see the :phpmethod:`MongoDB\Database::__get()`
+API documentation.
+
 .. _php-db-coll-create-collection:
 
 Create a Collection
@@ -100,7 +132,7 @@ You can query for a list of collections in a database by calling the
 cursor containing all collections in the database and their associated metadata.
 
 The following example calls the ``listCollections()`` method and iterates over
-the returned cursor to print the collections from the :ref:`php-db-coll-access-collection`
+the returned iterator to print the collections from the :ref:`php-db-coll-access-collection`
 and :ref:`php-db-coll-create-collection` examples:
 
 .. io-code-block::
@@ -129,9 +161,6 @@ and :ref:`php-db-coll-create-collection` examples:
          ...
       )
 
-For more information about iterating over a cursor, see the :ref:`php-cursors`
-guide. 
-
 Delete a Collection
 -------------------
 
@@ -164,22 +193,23 @@ read and write operations on a replica set by setting a **read concern** and a
 **write concern**.
 
 By default, databases inherit read and write settings from the ``MongoDB\Client``
-instance, and collections inherit them from the database. You can change
-these settings on your database by passing an options array to the
-``MongoDB\Client::selectDatabase()``. You can change these settings on your collection
-by passing an options array to the ``MongoDB\Client::selectCollection()`` method.
+instance. Collections inherit these settings from the ``MongoDB\Client`` or
+``MongoDB\Database`` instance on which the ``selectCollection()`` method is called.
+You can change these settings by passing an options array to the
+``MongoDB\Client::selectDatabase()``, ``MongoDB\Client::selectCollection()``, or
+``MongoDB\Database::selectCollection()`` methods.
 
 To change the read preference, read concern, and write concern of your database
 or collection, set the following options in the array parameter:
 
 - ``readPreference``: Sets the read preference. For a list of available read
-  preferences, see `MongoDB\\Driver\\ReadPreference <{+php-manual+}/class.mongodb-driver-readpreference>`__
+  preferences, see :php:`MongoDB\Driver\ReadPreference <mongodb-driver-readpreference>`
   in the extension API documentation.
 - ``readConcern``: Sets the read concern. For a list of available read
-  concerns, see `MongoDB\\Driver\\ReadConcern <{+php-manual+}/class.mongodb-driver-readconcern>`__
+  concerns, see :php:`MongoDB\Driver\ReadConcern <mongodb-driver-readconcern>`
   in the extension API documentation.
 - ``writeConcern``: Sets the write concern. For a list of available write
-  concerns, see `MongoDB\\Driver\\WriteConcern <{+php-manual+}/class.mongodb-driver-writeconcern>`__
+  concerns, see :php:`MongoDB\Driver\WriteConcern <mongodb-driver-writeconcern>`
   in the extension API documentation.
 
 .. tip::
@@ -217,8 +247,11 @@ array to ``selectCollection()``:
     :start-after: start-collection-settings
     :end-before: end-collection-settings
 
+Advanced Read Configurations 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Tag Sets
-~~~~~~~~
+````````
 
 In {+mdb-server+}, you can apply key-value :manual:`tags
 </core/read-preference-tags/>` to replica-set
@@ -243,7 +276,7 @@ center (``'dc' => 'sf'``):
     :end-before: end-tag-set
 
 Local Threshold
-~~~~~~~~~~~~~~~
+```````````````
 
 If multiple replica-set members match the read preference and tag sets you specify,
 the {+php-library+} reads from the nearest replica-set members, chosen according to

source/includes/databases-collections/databases-collections.php

@@ -1,24 +1,33 @@
 <?php
 require 'vendor/autoload.php';
 
-use MongoDB\BSON\Document;
 use MongoDB\Driver\ReadConcern;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\WriteConcern;
 
-$uri = getenv('MONGODB_URI') ?: throw new RuntimeException('Set the MONGODB_URI variable to your Atlas URI that connects to the sample dataset');
+$uri = getenv('MONGODB_URI') ?: throw new RuntimeException('Set the MONGODB_URI variable to your connection URI');
 $client = new MongoDB\Client($uri);
 
 // Accesses the "test_database" database
 // start-access-database
 $db = $client->selectDatabase('test_database');
 // end-access-database
 
+// Invokes the __get() method to access the "test_database" database
+// start-access-database-short
+$db = $client->test_database;
+// end-access-database-short
+
 // Accesses the "test_collection" collection
 // start-access-collection
 $collection = $client->test_database->selectCollection('test_collection');
 // end-access-collection
 
+// Invokes the __get() method to access the "test_collection" collection
+// start-access-collection-short
+$collection = $db->test_collection;
+// end-access-collection-short
+
 // Explicitly creates the "example_collection" collection
 // start-create-collection
 $result = $client->test_database->createCollection('example_collection');
@@ -63,13 +72,15 @@
 
 // end-collection-settings
 
-// Instructs the library to prefer New York data center reads using a tag set
+// Instructs the library to prefer reads from secondary replica set members
+// located in New York but fall back to those in San Francisco
 // start-tag-set
 $readPreference = new ReadPreference(
     ReadPreference::RP_SECONDARY,
     [
         ['dc' => 'ny'],
         ['dc' => 'sf'],
+        [],
     ],
 );
 
@@ -86,8 +97,8 @@
 $options = [
     'replicaSet' => 'repl0',
     'readPreference' => new ReadPreference(ReadPreference::RP_SECONDARY_PREFERRED),
-    'localThresholdMS' => 35
+    'localThresholdMS' => 35,
 ];
 
 $client = new Client('<connection string>', [], $options);
-// end-local-threshold
+// end-local-threshold