Jerome feedback

Author: mcmorisi

source/includes/read/change-streams/change-stream-options.php

@@ -0,0 +1,32 @@
+<?php
+require 'vendor/autoload.php'; 
+
+// start-to-json
+function toJSON(object $document): string
+{
+    return MongoDB\BSON\Document::fromPHP($document)->toRelaxedExtendedJSON();
+}
+// end-to-json
+
+$uri = getenv('MONGODB_URI') ?: throw new RuntimeException('Set the MONGODB_URI variable to your Atlas URI that connects to the sample dataset');
+$client = new MongoDB\Client($uri);
+
+// start-db-coll
+$collection = $client->sample_restaurants->restaurants;
+// end-db-coll
+
+// Passes an options argument to watch() to include the post-image of updated documents
+// start-change-stream-post-image
+$options = ['fullDocument' => MongoDB\Operation\Watch::FULL_DOCUMENT_UPDATE_LOOKUP];
+$changeStream = $collection->watch([], $options);
+$changeStream->rewind();
+
+do {
+    $changeStream->next();
+
+    if ($changeStream->valid()) {
+        $event = $changeStream->current();
+        echo toJSON($event), PHP_EOL;
+    }
+} while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
+// end-change-stream-post-image

source/includes/read/change-streams.php renamed to source/includes/read/change-streams/change-stream-pipeline.php

@@ -15,21 +15,6 @@ function toJSON(object $document): string
 $collection = $client->sample_restaurants->restaurants;
 // end-db-coll
 
-// Monitors and prints changes to the "restaurants" collection
-// start-open-change-stream
-$changeStream = $collection->watch();
-$changeStream->rewind();
-
-do {
-    $changeStream->next();
-
-    if ($changeStream->valid()) {
-        $event = $changeStream->current();
-        echo toJSON($event), PHP_EOL;
-    }
-} while {$event['operationType'] !== 'invalidate'};
-// end-open-change-stream
-
 // Updates a document that has a "name" value of "Blarney Castle"
 // start-update-for-change-stream
 $result = $collection->updateOne(
@@ -51,23 +36,5 @@ function toJSON(object $document): string
         $event = $changeStream->current();
         echo toJSON($event), PHP_EOL;
     }
-
-} while ($event['operationType'] !== 'invalidate');
+} while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
 // end-change-stream-pipeline
-
-// Passes an options argument to watch() to include the post-image of updated documents
-// start-change-stream-post-image
-$options = ['fullDocument' => MongoDB\Operation\Watch::FULL_DOCUMENT_UPDATE_LOOKUP];
-$changeStream = $collection->watch([], $options);
-$changeStream->rewind();
-
-do {
-    $changeStream->next();
-
-    if ($changeStream->valid()) {
-        $event = $changeStream->current();
-        echo toJSON($event), PHP_EOL;
-    }
-} while ($event['operationType'] !== 'invalidate');
-// end-change-stream-post-image
-

source/includes/read/change-streams/open-change-stream.php

@@ -0,0 +1,31 @@
+<?php
+require 'vendor/autoload.php'; 
+
+// start-to-json
+function toJSON(object $document): string
+{
+    return MongoDB\BSON\Document::fromPHP($document)->toRelaxedExtendedJSON();
+}
+// end-to-json
+
+$uri = getenv('MONGODB_URI') ?: throw new RuntimeException('Set the MONGODB_URI variable to your Atlas URI that connects to the sample dataset');
+$client = new MongoDB\Client($uri);
+
+// start-db-coll
+$collection = $client->sample_restaurants->restaurants;
+// end-db-coll
+
+// Monitors and prints changes to the "restaurants" collection
+// start-open-change-stream
+$changeStream = $collection->watch();
+$changeStream->rewind();
+
+do {
+    $changeStream->next();
+
+    if ($changeStream->valid()) {
+        $event = $changeStream->current();
+        echo toJSON($event), PHP_EOL;
+    }
+} while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
+// end-open-change-stream

source/includes/usage-examples/read-code-examples.php

@@ -61,5 +61,5 @@
         $event = $changeStream->current();
         echo toJSON($event) . PHP_EOL;
     }
-} while ($event['operationType'] !== 'invalidate');
+} while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
 // end-change-stream