Fix CS

Author: GromNaN

src/GridFS/Bucket.php

@@ -219,12 +219,6 @@ public function __debugInfo()
         ];
     }
 
-    public function registerAsDefaultStreamWrapper(): void
-    {
-        // Use a closure to expose the private method into another class
-        StreamWrapper::setDefaultContextResolver(fn (string $path, string $mode) => $this->resolveStreamContext($path, $mode));
-    }
-
     /**
      * Delete a file from the GridFS bucket.
      *
@@ -598,6 +592,18 @@ public function openUploadStream(string $filename, array $options = [])
         return fopen($path, 'w', false, $context);
     }
 
+    /**
+     * For legacy applications that needs to open stream from a string, the bucket can be registered in the stream
+     * wrapper to be used by default when no GridFS context is provided.
+     * Supported file name must follow this pattern:
+     *     gridfs://<database_name>/<bucket_name>.fs/<file_name>
+     */
+    public function registerAsDefaultStreamWrapper(): void
+    {
+        // Use a closure to expose the private method into another class
+        StreamWrapper::setDefaultContextResolver(fn (string $path, string $mode) => $this->resolveStreamContext($path, $mode));
+    }
+
     /**
      * Renames the GridFS file with the specified ID.
      *
@@ -670,55 +676,6 @@ public function uploadFromStream(string $filename, $source, array $options = [])
         return $this->getFileIdForStream($destination);
     }
 
-    /**
-     * Create a stream context from
-     *
-     * @see StreamWrapper::setDefaultContextResolver()
-     * @see stream_context_create()
-     *
-     * @param string $path The full url provided to fopen(). It contains the filename.
-     *                     gridfs://database_name/collection_name.files/file_name
-     *
-     * @return array{collectionWrapper: CollectionWrapper, file: object}|array{collectionWrapper: CollectionWrapper, filename: string, options: array}|null
-     */
-    private function resolveStreamContext(string $path, string $mode): ?array
-    {
-        // The file can be read only if it belongs to this bucket
-        $basePath = $this->createPathForFile((object) ['_id' => '']);
-        if (! str_starts_with($path, $basePath)) {
-            return null;
-        }
-
-        $filename = urldecode(substr($path, strlen($basePath)));
-
-        if (str_contains($mode, 'r')) {
-            $file = $this->collectionWrapper->findFileByFilenameAndRevision($filename, -1);
-
-            // File not found
-            if ($file === null) {
-                return null;
-            }
-
-            return [
-                'collectionWrapper' => $this->collectionWrapper,
-                'file' => $file,
-            ];
-        }
-
-        if (str_contains($mode, 'w')) {
-            return [
-                'collectionWrapper' => $this->collectionWrapper,
-                'filename' => $filename,
-                'options' => [
-                    'chunkSizeBytes' => $this->chunkSizeBytes,
-                    'disableMD5' => $this->disableMD5,
-                ],
-            ];
-        }
-
-        return null;
-    }
-
     /**
      * Creates a path for an existing GridFS file.
      *
@@ -816,4 +773,53 @@ private function registerStreamWrapper(): void
 
         StreamWrapper::register(self::STREAM_WRAPPER_PROTOCOL);
     }
+
+    /**
+     * Create a stream context from
+     *
+     * @see StreamWrapper::setDefaultContextResolver()
+     * @see stream_context_create()
+     *
+     * @param string $path The full url provided to fopen(). It contains the filename.
+     *                     gridfs://database_name/collection_name.files/file_name
+     *
+     * @return array{collectionWrapper: CollectionWrapper, file: object}|array{collectionWrapper: CollectionWrapper, filename: string, options: array}|null
+     */
+    private function resolveStreamContext(string $path, string $mode): ?array
+    {
+        // The file can be read only if it belongs to this bucket
+        $basePath = $this->createPathForFile((object) ['_id' => '']);
+        if (! str_starts_with($path, $basePath)) {
+            return null;
+        }
+
+        $filename = urldecode(substr($path, strlen($basePath)));
+
+        if (str_contains($mode, 'r')) {
+            $file = $this->collectionWrapper->findFileByFilenameAndRevision($filename, -1);
+
+            // File not found
+            if ($file === null) {
+                return null;
+            }
+
+            return [
+                'collectionWrapper' => $this->collectionWrapper,
+                'file' => $file,
+            ];
+        }
+
+        if (str_contains($mode, 'w')) {
+            return [
+                'collectionWrapper' => $this->collectionWrapper,
+                'filename' => $filename,
+                'options' => [
+                    'chunkSizeBytes' => $this->chunkSizeBytes,
+                    'disableMD5' => $this->disableMD5,
+                ],
+            ];
+        }
+
+        return null;
+    }
 }

src/GridFS/StreamWrapper.php

@@ -21,7 +21,6 @@
 use MongoDB\BSON\UTCDateTime;
 
 use function assert;
-use function call_user_func;
 use function explode;
 use function in_array;
 use function is_array;
@@ -63,16 +62,6 @@ class StreamWrapper
     /** @var Closure(string, string): ContextOptions|null */
     private static ?Closure $contextResolver = null;
 
-    /**
-     * @see Bucket::resolveStreamContext()
-     *
-     * @param Closure(string, string):ContextOptions|null $resolver
-     */
-    public static function setDefaultContextResolver(?Closure $resolver): void
-    {
-        self::$contextResolver = $resolver;
-    }
-
     public function __destruct()
     {
         /* Ensure the stream is closed so the last chunk is written. This is
@@ -106,6 +95,16 @@ public static function register(string $protocol = 'gridfs'): void
         stream_wrapper_register($protocol, static::class, STREAM_IS_URL);
     }
 
+    /**
+     * @see Bucket::resolveStreamContext()
+     *
+     * @param Closure(string, string):ContextOptions|null $resolver
+     */
+    public static function setDefaultContextResolver(?Closure $resolver): void
+    {
+        self::$contextResolver = $resolver;
+    }
+
     /**
      * Closes the stream.
      *
@@ -145,7 +144,7 @@ public function stream_eof(): bool
      */
     public function stream_open(string $path, string $mode, int $options, ?string &$openedPath): bool
     {
-        $protocol = $this->parseProtocol($path);
+        $protocol = $this->initProtocol($path);
 
         assert(is_resource($this->context));
         $contextOptions = stream_context_get_options($this->context)[$protocol] ?? null;
@@ -159,7 +158,7 @@ public function stream_open(string $path, string $mode, int $options, ?string &$
                 return false;
             }
 
-            $contextOptions = call_user_func(self::$contextResolver, $path, $mode);
+            $contextOptions = (self::$contextResolver)($path, $mode);
             if ($contextOptions === null) {
                 if ($options & STREAM_REPORT_ERRORS) {
                     trigger_error(sprintf('File not found "%s" with the default GridFS resolver.', $path), E_USER_WARNING);
@@ -331,7 +330,7 @@ private function getStatTemplate(): array
      *
      * @see StreamWrapper::stream_open()
      */
-    private function parseProtocol(string $path): string
+    private function initProtocol(string $path): string
     {
         $parts = explode('://', $path, 2);