php 7.x compat

FriendsOfFlarum · Oct 21, 2023 · 1874d82 · 1874d82
1 parent 016ea9d
commit 1874d82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -4,7 +4,7 @@ on: [workflow_dispatch, push, pull_request]
 
 jobs:
   run:
-    uses: flarum/framework/.github/workflows/REUSABLE_backend.yml@2.x
+    uses: flarum/framework/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

diff --git a/src/Listener/SaveReactionsToDatabase.php b/src/Listener/SaveReactionsToDatabase.php
@@ -230,6 +230,7 @@ protected function isExtensionEnabled(string $extension): bool
 
     protected function getSessionId(): ?string
     {
-        return $this->request->getAttribute('session')?->getId();
+        $session = $this->request->getAttribute('session');
+        return $session ? $session->getId() : null;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: [workflow_dispatch, push, pull_request] @@
     jobs:
       run:
-        uses: flarum/framework/.github/workflows/REUSABLE_backend.yml@2.x
+        uses: flarum/framework/.github/workflows/REUSABLE_backend.yml@main
         with:
           enable_backend_testing: true
@@ Expand Down @@