Fix comment and don't use MongoDB\BSON\Binary objects

Author: kvwalker

src/ChangeStream.php

@@ -101,12 +101,12 @@ public function next()
                 $this->hasAdvanced = true;
                 $this->resumeToken = $this->extractResumeToken($this->csIt->current());
             }
-            // If the cursorId is 0, the server has invalidated the cursor so we
-            // will never perform another getMore. This means that we cannot
-            // resume and we can therefore unset the resumeCallable, which will
-            // free any reference to Watch. This will also free the only
-            // reference to an implicit session, since any such reference
-            // belongs to Watch.
+            /* If the cursorId is 0, the server has invalidated the cursor so we
+             * will never perform another getMore. This means that we cannot
+             * resume and we can therefore unset the resumeCallable, which will
+             * free any reference to Watch. This will also free the only
+             * reference to an implicit session, since any such reference
+             * belongs to Watch. */
             if ($this->getCursorId() === 0) {
                 unset($this->resumeCallable);
             }
@@ -139,12 +139,7 @@ public function rewind()
                 $this->hasAdvanced = true;
                 $this->resumeToken = $this->extractResumeToken($this->csIt->current());
             }
-            // If the cursorId is 0, the server has invalidated the cursor so we
-            // will never perform another getMore. This means that we cannot
-            // resume and we can therefore unset the resumeCallable, which will
-            // free any reference to Watch. This will also free the only
-            // reference to an implicit session, since any such reference
-            // belongs to Watch.
+            // As with next(), free the callable once we know it will never be used.
             if ($this->getCursorId() === 0) {
                 unset($this->resumeCallable);
             }

tests/Operation/WatchFunctionalTest.php

@@ -606,7 +606,7 @@ function() use ($operation, &$changeStream) {
             },
             function($changeStream) use (&$originalSession) {
                 if (isset($changeStream->aggregate)) {
-                    $originalSession = $changeStream->lsid;
+                    $originalSession = bin2hex((string) $changeStream->lsid->id);
                 }
             }
         );
@@ -620,7 +620,7 @@ function() use (&$changeStream) {
             },
             function ($changeStream) use (&$sessionAfterResume) {
                 if (isset($changeStream->aggregate)) {
-                    $sessionAfterResume = $changeStream->lsid;
+                    $sessionAfterResume = bin2hex((string) $changeStream->lsid->id);
                 }
             }
         );