[transport] Fs transport dsn must contain one extra "/"

Author: makasim

pkg/enqueue/Consumption/Exception/InvalidArgumentException.php

@@ -12,7 +12,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce
      */
     public static function assertInstanceOf($argument, $class)
     {
-        if (!$argument instanceof $class) {
+        if (false == $argument instanceof $class) {
             throw new static(sprintf(
                 'The argument must be an instance of %s but got %s.',
                 $class,

pkg/enqueue/Tests/Functions/DsnToConnectionFactoryFunctionTest.php

@@ -54,7 +54,7 @@ public static function provideDSNs()
 
         yield ['file://', FsConnectionFactory::class];
 
-        yield ['file://foo/bar/baz', FsConnectionFactory::class];
+        yield ['file:///foo/bar/baz', FsConnectionFactory::class];
 
         yield ['null://', NullConnectionFactory::class];
     }

pkg/enqueue/Tests/Functions/DsnToContextFunctionTest.php

@@ -54,7 +54,7 @@ public static function provideDSNs()
 
         yield ['file://', FsContext::class];
 
-        yield ['file:/'.sys_get_temp_dir(), FsContext::class];
+        yield ['file://'.sys_get_temp_dir(), FsContext::class];
 
         yield ['null://', NullContext::class];
     }

pkg/fs/FsConnectionFactory.php

@@ -62,16 +62,17 @@ private function parseDsn($dsn)
             return ['path' => $dsn];
         }
 
-        $scheme = parse_url($dsn, PHP_URL_SCHEME);
+        if (false === strpos($dsn, 'file://')) {
+            throw new \LogicException(sprintf('The given DSN "%s" is not supported. Must start with "file://".', $dsn));
+        }
+
+        $dsn = substr($dsn, 7);
+
         $path = parse_url($dsn, PHP_URL_PATH);
-        $host = parse_url($dsn, PHP_URL_HOST);
         $query = parse_url($dsn, PHP_URL_QUERY);
-        if (false === $scheme) {
-            throw new \LogicException(sprintf('Failed to parse DSN "%s"', $dsn));
-        }
 
-        if ('file' !== $scheme) {
-            throw new \LogicException('The given DSN scheme "%s" is not supported. Could be "file" only.');
+        if ('/' != $path[0]) {
+            throw new \LogicException(sprintf('Failed to parse DSN path "%s". The path must start with "/"', $path));
         }
 
         if ($query) {
@@ -87,7 +88,7 @@ private function parseDsn($dsn)
             $config['chmod'] = intval($config['chmod'], 8);
         }
 
-        $config['path'] = sprintf('/%s%s', $host, $path);
+        $config['path'] = $path;
 
         return $config;
     }

pkg/fs/Tests/FsConnectionFactoryConfigTest.php

@@ -24,15 +24,15 @@ public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     public function testThrowIfSchemeIsNotAmqp()
     {
         $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('The given DSN scheme "%s" is not supported. Could be "file" only.');
+        $this->expectExceptionMessage('The given DSN "http://example.com" is not supported. Must start with "file://');
 
         new FsConnectionFactory('http://example.com');
     }
 
     public function testThrowIfDsnCouldNotBeParsed()
     {
         $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('Failed to parse DSN "file://:@/"');
+        $this->expectExceptionMessage('Failed to parse DSN path ":@/". The path must start with "/"');
 
         new FsConnectionFactory('file://:@/');
     }
@@ -89,27 +89,27 @@ public static function provideConfigs()
         ];
 
         yield [
-            __DIR__,
+            '/foo/bar/baz',
             [
-                'path' => __DIR__,
+                'path' => '/foo/bar/baz',
                 'pre_fetch_count' => 1,
                 'chmod' => 0600,
             ],
         ];
 
         yield [
-            'file:/'.__DIR__,
+            'file:///foo/bar/baz',
             [
-                'path' => __DIR__,
+                'path' => '/foo/bar/baz',
                 'pre_fetch_count' => 1,
                 'chmod' => 0600,
             ],
         ];
 
         yield [
-            'file:/'.__DIR__.'?pre_fetch_count=100&chmod=0666',
+            'file:///foo/bar/baz?pre_fetch_count=100&chmod=0666',
             [
-                'path' => __DIR__,
+                'path' => '/foo/bar/baz',
                 'pre_fetch_count' => 100,
                 'chmod' => 0666,
             ],