Merge branch '2' into 3

.github/workflows/dispatch-ci.yml

@@ -1,16 +1,21 @@
 name: Dispatch CI
 
 on:
-  # At 12:10 PM UTC, only on Tuesday and Wednesday
+  # At 4:20 PM UTC, only on Wednesday and Thursday
   schedule:
-    - cron: '10 12 * * 2,3'
+    - cron: '20 16 * * 3,4'
+
+permissions: {}
 
 jobs:
   dispatch-ci:
     name: Dispatch CI
     # Only run cron on the silverstripe account
     if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: write
     steps:
       - name: Dispatch CI
         uses: silverstripe/gha-dispatch-ci@v1

.github/workflows/keepalive.yml

@@ -1,17 +1,21 @@
 name: Keepalive
 
 on:
-  # At 10:50 PM UTC, on day 7 of the month
+  # At 4:20 PM UTC, on day 25 of the month
   schedule:
-    - cron: '50 22 7 * *'
+    - cron: '20 16 25 * *'
   workflow_dispatch:
 
+permissions: {}
+
 jobs:
   keepalive:
     name: Keepalive
     # Only run cron on the silverstripe account
     if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
     steps:
       - name: Keepalive
         uses: silverstripe/gha-keepalive@v1

.github/workflows/merge-up.yml

@@ -1,17 +1,22 @@
 name: Merge-up
 
 on:
-  # At 12:10 PM UTC, only on Saturday
+  # At 4:20 PM UTC, only on Sunday
   schedule:
-    - cron: '10 12 * * 6'
+    - cron: '20 16 * * 0'
   workflow_dispatch:
 
+permissions: {}
+
 jobs:
   merge-up:
     name: Merge-up
     # Only run cron on the silverstripe account
     if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      actions: write
     steps:
       - name: Merge-up
         uses: silverstripe/gha-merge-up@v1

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);
+    }
 }