Rewrite conditional to avoid suppressing psalm errors

alcaeus · alcaeus · commit 5b38a828d0f4 · 2022-09-15T10:42:42.000+02:00
diff --git a/src/GridFS/Bucket.php b/src/GridFS/Bucket.php
@@ -645,11 +645,10 @@ public function uploadFromStream(string $filename, $source, array $options = [])
      */
     private function createPathForFile(object $file): string
     {
-        if (! is_object($file->_id) || method_exists($file->_id, '__toString')) {
-            /** @psalm-suppress PossiblyInvalidCast */
-            $id = (string) $file->_id;
-        } else {
+        if (is_array($file->_id) || (is_object($file->_id) && ! method_exists($file->_id, '__toString'))) {
             $id = toJSON(fromPHP(['_id' => $file->_id]));
+        } else {
+            $id = (string) $file->_id;
         }
 
         return sprintf(

Original file line number	Diff line number	Diff line change
`@@ -645,11 +645,10 @@ public function uploadFromStream(string $filename, $source, array $options = [])`
`645`	`645`	`*/`
`646`	`646`	`private function createPathForFile(object $file): string`
`647`	`647`	`{`
`648`		`- if (! is_object($file->_id) \|\| method_exists($file->_id, '__toString')) {`
`649`		`- /** @psalm-suppress PossiblyInvalidCast */`
`650`		`- $id = (string) $file->_id;`
`651`		`- } else {`
	`648`	`+ if (is_array($file->_id) \|\| (is_object($file->_id) && ! method_exists($file->_id, '__toString'))) {`
`652`	`649`	`$id = toJSON(fromPHP(['_id' => $file->_id]));`
	`650`	`+ } else {`
	`651`	`+ $id = (string) $file->_id;`
`653`	`652`	`}`
`654`	`653`
`655`	`654`	`return sprintf(`