Merge branch 'master' into v3

Author: sifex

src/BunnyCDNAdapter.php

@@ -586,6 +586,12 @@ public function temporaryUrl(string $path, DateTimeInterface $expiresAt, Config
 
         // extract our query params
         parse_str($parts['query'] ?? '', $params);
+
+        // check if we are passing additional query parameters
+        if (($queryParams = $config->get('withQueryParams')) && is_array($queryParams)) {
+            $params = array_merge($params, $queryParams);
+        }
+
         ksort($params);
 
         // concatenate all of our data

tests/TemporaryUrlTest.php

@@ -34,4 +34,22 @@ public function test_it_can_generate_signing_key()
         $this->assertStringContainsString('https://pz-url.co.uk/testing.txt?token=', $url);
         $this->assertStringContainsString('expires='.$expiresAt->getTimestamp(), $url);
     }
+
+    public function test_it_will_accept_query_params()
+    {
+        $client = new BunnyCDNClient('test', 'test');
+        $adapter = new BunnyCDNAdapter($client, 'https://pz-url.co.uk');
+        $adapter->setTokenAuthKey('test-auth-key');
+
+        $expiresAt = new \DateTimeImmutable('+1 hour');
+        $url = $adapter->temporaryUrl('testing.txt', $expiresAt, new Config([
+            'withQueryParams' => [
+                'testParam' => 'testValue',
+            ],
+        ]));
+
+        $this->assertStringContainsString('https://pz-url.co.uk/testing.txt?token=', $url);
+        $this->assertStringContainsString('expires='.$expiresAt->getTimestamp(), $url);
+        $this->assertStringContainsString('testParam=testValue', $url);
+    }
 }