PHP team feedback

Author: mcmorisi

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

@@ -21,12 +21,18 @@ function toJSON(object $document): string
 $changeStream = $collection->watch([], $options);
 $changeStream->rewind();
 
-do {
+while (true) {
     $changeStream->next();
 
     if ($changeStream->valid()) {
-        $event = $changeStream->current();
-        echo toJSON($event), PHP_EOL;
+        continue;
     }
-} while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
+
+    $event = $changeStream->current();
+    echo toJSON($event), PHP_EOL;
+
+    if ($changeStream->current()['operationType'] === 'invalidate') {
+        break;
+    }
+}
 // end-change-stream-post-image

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

@@ -29,12 +29,18 @@ function toJSON(object $document): string
 $changeStream = $collection->watch($pipeline);
 $changeStream->rewind();
 
-do {
+while (true) {
     $changeStream->next();
 
     if ($changeStream->valid()) {
-        $event = $changeStream->current();
-        echo toJSON($event), PHP_EOL;
+        continue;
     }
-} while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
+
+    $event = $changeStream->current();
+    echo toJSON($event), PHP_EOL;
+
+    if ($changeStream->current()['operationType'] === 'invalidate') {
+        break;
+    }
+}
 // end-change-stream-pipeline

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

@@ -28,6 +28,21 @@ function toJSON(object $document): string
         echo toJSON($event), PHP_EOL;
     }
 } while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
+
+while (true) {
+    $changeStream->next();
+
+    if ($changeStream->valid()) {
+        continue;
+    }
+
+    $event = $changeStream->current();
+    echo toJSON($event), PHP_EOL;
+
+    if ($changeStream->current()['operationType'] === 'invalidate') {
+        break;
+    }
+}
 // end-open-change-stream
 
 // Updates a document that has a "name" value of "Blarney Castle"

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

@@ -54,12 +54,18 @@
 $changeStream = $collection->watch();
 $changeStream->rewind();
 
-do {
+while (true) {
     $changeStream->next();
 
     if ($changeStream->valid()) {
-        $event = $changeStream->current();
-        echo toJSON($event) . PHP_EOL;
+        continue;
     }
-} while (! $changeStream->valid() || $changeStream->current()['operationType'] !== 'invalidate');
+
+    $event = $changeStream->current();
+    echo toJSON($event), PHP_EOL;
+
+    if ($changeStream->current()['operationType'] === 'invalidate') {
+        break;
+    }
+}
 // end-change-stream