Merge pull request mongodb#1806 from halaei/fix-for-non-string-id

jenssegers · web-flow · commit 01ac069cf88a · 2019-08-21T09:49:07.000+02:00
fix for non string id
diff --git a/src/Jenssegers/Mongodb/Query/Builder.php b/src/Jenssegers/Mongodb/Query/Builder.php
@@ -854,7 +854,7 @@ public function convertKey($id)
     {
         if (is_string($id) && strlen($id) === 24 && ctype_xdigit($id)) {
             return new ObjectID($id);
-        } elseif (strlen($id) === 16 && preg_match('~[^\x20-\x7E\t\r\n]~', $id) > 0) {
+        } elseif (is_string($id) && strlen($id) === 16 && preg_match('~[^\x20-\x7E\t\r\n]~', $id) > 0) {
             return new Binary($id, Binary::TYPE_UUID);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ public function convertKey($id)`
`854`	`854`	`{`
`855`	`855`	`if (is_string($id) && strlen($id) === 24 && ctype_xdigit($id)) {`
`856`	`856`	`return new ObjectID($id);`
`857`		`- } elseif (strlen($id) === 16 && preg_match('~[^\x20-\x7E\t\r\n]~', $id) > 0) {`
	`857`	`+ } elseif (is_string($id) && strlen($id) === 16 && preg_match('~[^\x20-\x7E\t\r\n]~', $id) > 0) {`
`858`	`858`	`return new Binary($id, Binary::TYPE_UUID);`
`859`	`859`	`}`
`860`	`860`