Drops PHP 7.4 to favor attributes.

Saeven · Mar 20, 2024 · 077af52 · 077af52
1 parent 52da59a
commit 077af52
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bundle/Spec/CirclicalUser/Objects/SampleUser.php b/bundle/Spec/CirclicalUser/Objects/SampleUser.php
@@ -33,7 +33,7 @@ public function getName(): string
         return $this->name;
     }
 
-    public function getId(): int|string
+    public function getId(): int|string|null
     {
         return $this->id;
     }

diff --git a/bundle/Spec/CirclicalUser/Service/AccessServiceSpec.php b/bundle/Spec/CirclicalUser/Service/AccessServiceSpec.php
@@ -285,7 +285,7 @@ function it_accepts_a_user_with_an_id(User $testUser)
 
     function it_rejects_users_with_no_id(User $noUser)
     {
-        $noUser->getId()->willReturn(null);
+        $noUser->getId()->willReturn();
         $this->shouldThrow(UserRequiredException::class)->during('setUser', [$noUser]);
     }
 

diff --git a/src/Provider/UserInterface.php b/src/Provider/UserInterface.php
@@ -6,7 +6,7 @@
 
 interface UserInterface
 {
-    public function getId(): int|string;
+    public function getId(): int|string|null;
 
     public function getRoles(): array;
 

diff --git a/src/Service/AuthenticationService.php b/src/Service/AuthenticationService.php
@@ -387,9 +387,9 @@ private function setCookie(string $name, string $value, int $expiry, bool $httpO
      *  - COOKIE_USER has its contents encrypted by the system key
      *  - the random-named-cookie has its contents encrypted by the user key
      *
-     * @throws InvalidKey
      * @see self::setSessionCookies
      *
+     * @throws InvalidKey
      */
     public function getIdentity(): ?User
     {