Merge pull request #603 from creative-commoners/pulls/2.2/public-url-…

…slashes

FIX Ensure public url slashes are forward slashes

src/Flysystem/PublicAssetAdapter.php

@@ -53,6 +53,7 @@ protected function findRoot($root)
      */
     public function getPublicUrl($path)
     {
+        $path = Convert::slashes($path, '/');
         return Controller::join_links(Director::baseURL(), $this->parentUrlPrefix, $path);
     }
 

tests/php/PublicAssetAdapterTest.php

@@ -28,4 +28,32 @@ public function testInitBaseURL()
             $adapter->getPublicUrl('dir/file.jpg')
         );
     }
+
+    public function provideGetPublicUrl(): array
+    {
+        return [
+            'filename' => [
+                'path' => 'lorem.jpg',
+                'expected' => '/baseurl/assets/lorem.jpg',
+            ],
+            'unixPath' => [
+                'path' => 'path/to/lorem.jpg',
+                'expected' => '/baseurl/assets/path/to/lorem.jpg',
+            ],
+            'windowsPath' => [
+                'path' => 'path\\to\\lorem.jpg',
+                'expected' => '/baseurl/assets/path/to/lorem.jpg',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideGetPublicUrl
+     */
+    public function testGetPublicUrl(string $path, string $expected)
+    {
+        $adapter = new PublicAssetAdapter('assets');
+        $actual = $adapter->getPublicUrl($path);
+        $this->assertSame($expected, $actual);
+    }
 }