Merge branch '6.2' into 6.3

Author: github-actions[bot]

.github/workflows/ci.yml

@@ -8,4 +8,6 @@ on:
 jobs:
   ci:
     name: CI
+    # Do not run if this is a pull-request from same repo i.e. not a fork repo
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

src/Publisher.php

@@ -89,7 +89,7 @@ public function generatePageResponse($url)
         }
         try {
             $ssl = Environment::getEnv('SS_STATIC_FORCE_SSL');
-            if (is_null($ssl)) {
+            if (!$ssl) {
                 $ssl = $urlParts['scheme'] == 'https' ? true : false;
             }
 

tests/php/Publisher/FilesystemPublisherTest.php

@@ -135,6 +135,12 @@ public function testUrlToPathWithDomainBasedCaching(): void
             'domain2.com/parent/child',
             $urlToPath->invokeArgs($this->fsp, [$url])
         );
+
+        $url = 'https://domain2.com/parent/child';
+        $this->assertSame(
+            'domain2.com/parent/child',
+            $urlToPath->invokeArgs($this->fsp, [$url])
+        );
     }
 
     public function testMenu2LinkingMode(): void
@@ -351,7 +357,22 @@ public function providePathsToURL()
         ];
     }
 
-    public function testGetPublishedURLs(): void
+    public function provideGetPublishedURLs(): array
+    {
+        return [
+            [
+                'baseURL' => 'http://example.com',
+            ],
+            [
+                'baseURL' => 'https://example.com',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideGetPublishedURLs
+     */
+    public function testGetPublishedURLs(string $baseUrl): void
     {
         $level1 = new StaticPublisherTestPage();
         $level1->URLSegment = 'find-me';
@@ -368,19 +389,19 @@ public function testGetPublishedURLs(): void
 
         $this->fsp->publishURL('find-me', true);
         // We have to redeclare this config because the testkernel wipes it when we generate the page response
-        Director::config()->set('alternate_base_url', 'http://example.com');
+        Director::config()->set('alternate_base_url', $baseUrl);
 
-        $this->assertSame(['http://example.com/find-me'], $this->fsp->getPublishedURLs());
+        $this->assertSame([$baseUrl . '/find-me'], $this->fsp->getPublishedURLs());
 
         $this->fsp->publishURL($level2_1->Link(), true);
-        Director::config()->set('alternate_base_url', 'http://example.com');
+        Director::config()->set('alternate_base_url', $baseUrl);
 
         $urls = $this->fsp->getPublishedURLs();
-        $this->assertContains('http://example.com/find-me', $urls);
-        $this->assertContains('http://example.com/find-me/find-me-child', $urls);
+        $this->assertContains($baseUrl . '/find-me', $urls);
+        $this->assertContains($baseUrl . '/find-me/find-me-child', $urls);
         $this->assertCount(2, $urls);
 
         $this->fsp->purgeURL('find-me');
-        $this->assertSame(['http://example.com/find-me/find-me-child'], $this->fsp->getPublishedURLs());
+        $this->assertSame([$baseUrl . '/find-me/find-me-child'], $this->fsp->getPublishedURLs());
     }
 }