fix php 8.4 deprecations

tacman · Nov 21, 2024 · 3011084 · 3011084
1 parent c17c7f1
commit 3011084
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         # All supported PHP versions https://www.php.net/supported-versions.php
-        php: [ '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '8.2','8.3','8.4' ]
 
     runs-on: ${{matrix.os}}
 

diff --git a/src/Oauth/PhpFlickrService.php b/src/Oauth/PhpFlickrService.php
@@ -21,7 +21,7 @@ public function __construct(
         ClientInterface $httpClient,
         TokenStorageInterface $storage,
         SignatureInterface $signature,
-        UriInterface $baseApiUri = null
+        ?UriInterface $baseApiUri = null
     ) {
         if ($baseApiUri === null) {
             $baseApiUri = new Uri(static::$baseUrl . '/rest/');

diff --git a/src/PhotosApi.php b/src/PhotosApi.php
@@ -847,9 +847,9 @@ public function setContentType($photoId, $contentType)
      */
     public function setDates(
         $photoId,
-        DateTime $dateTaken = null,
+        DateTime|null $dateTaken = null,
         $dateTakenGranularity = null,
-        DateTime $datePosted = null
+        DateTime|null $datePosted = null
     ) {
         $args = ['photo_id' => $photoId];
         if (!empty($dateTaken)) {

diff --git a/src/PhpFlickr.php b/src/PhpFlickr.php
@@ -81,7 +81,7 @@ class PhpFlickr
      * @param string $apiKey
      * @param string|null $secret
      */
-    public function __construct(string $apiKey, string $secret = null)
+    public function __construct(string $apiKey, string|null $secret = null)
     {
         $this->api_key = $apiKey;
         $this->secret = $secret;