Updating Auth code with PHP 8.1 features (#608)

spiral · Mar 24, 2022 · 21b6b3c · 21b6b3c
1 parent 64d1049
commit 21b6b3c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 87 deletions.
diff --git a/src/Auth/src/ActorProviderInterface.php b/src/Auth/src/ActorProviderInterface.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Auth;

diff --git a/src/Auth/src/AuthContext.php b/src/Auth/src/AuthContext.php
@@ -1,41 +1,21 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Auth;
 
 final class AuthContext implements AuthContextInterface
 {
-    /** @var ActorProviderInterface */
-    private $actorProvider;
-
-    /** @var TokenInterface|null */
-    private $token;
-
-    /** @var object|null */
-    private $actor;
-
-    /** @var string|null */
-    private $transport;
-
-    /** @var bool */
-    private $closed = false;
-
-    public function __construct(ActorProviderInterface $actorProvider)
-    {
-        $this->actorProvider = $actorProvider;
+    private ?TokenInterface $token = null;
+    private ?object $actor = null;
+    private ?string $transport = null;
+    private bool $closed = false;
+
+    public function __construct(
+        private readonly ActorProviderInterface $actorProvider
+    ) {
     }
 
-    /**
-     * @inheritDoc
-     */
     public function start(TokenInterface $token, string $transport = null): void
     {
         $this->closed = false;
@@ -44,25 +24,16 @@ public function start(TokenInterface $token, string $transport = null): void
         $this->transport = $transport;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getToken(): ?TokenInterface
     {
         return $this->token;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getTransport(): ?string
     {
         return $this->transport;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getActor(): ?object
     {
         if ($this->closed) {
@@ -76,18 +47,12 @@ public function getActor(): ?object
         return $this->actor;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function close(): void
     {
         $this->closed = true;
         $this->actor = null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function isClosed(): bool
     {
         return $this->closed;

diff --git a/src/Auth/src/AuthContextInterface.php b/src/Auth/src/AuthContextInterface.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Auth;
@@ -18,8 +11,6 @@ interface AuthContextInterface
 {
     /**
      * Start new auth context based on a given token. Actor can be received on demand.
-     *
-     * @param string|null    $transport
      */
     public function start(TokenInterface $token, string $transport = null): void;
 

diff --git a/src/Auth/src/Exception/AuthException.php b/src/Auth/src/Exception/AuthException.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Auth\Exception;

diff --git a/src/Auth/src/Exception/TokenStorageException.php b/src/Auth/src/Exception/TokenStorageException.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Auth\Exception;

diff --git a/src/Auth/src/TokenInterface.php b/src/Auth/src/TokenInterface.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Auth;

diff --git a/src/Auth/src/TokenStorageInterface.php b/src/Auth/src/TokenStorageInterface.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Auth;