removed deprecated IAuthenticator (BC break)

Author: dg

src/Bridges/SecurityDI/SecurityExtension.php

@@ -97,7 +97,7 @@ public function loadConfiguration()
 			}
 
 			$builder->addDefinition($this->prefix('authenticator'))
-				->setType(Nette\Security\IAuthenticator::class)
+				->setType(Nette\Security\Authenticator::class)
 				->setFactory(Nette\Security\SimpleAuthenticator::class, [$usersList, $usersRoles, $usersData]);
 
 			if ($this->name === 'security') {

src/Security/Authenticator.php

@@ -13,7 +13,7 @@
 /**
  * Performs authentication.
  */
-interface Authenticator extends IAuthenticator
+interface Authenticator
 {
 	/** Exception error code */
 	public const
@@ -22,6 +22,13 @@ interface Authenticator extends IAuthenticator
 		Failure = 3,
 		NotApproved = 4;
 
+	/** Deprecated */
+	public const
+		IDENTITY_NOT_FOUND = self::IdentityNotFound,
+		INVALID_CREDENTIAL = self::InvalidCredential,
+		FAILURE = self::Failure,
+		NOT_APPROVED = self::NotApproved;
+
 	/**
 	 * Performs an authentication.
 	 * @throws AuthenticationException

src/Security/IAuthenticator.php

@@ -21,7 +21,7 @@
  * @property-read string|int $id
  * @property-read array $roles
  * @property-read int $logoutReason
- * @property   IAuthenticator $authenticator
+ * @property   Authenticator $authenticator
  * @property   Authorizator $authorizator
  */
 class User
@@ -56,7 +56,7 @@ class User
 
 	/** Session storage for current user */
 	private UserStorage $storage;
-	private ?IAuthenticator $authenticator;
+	private ?Authenticator $authenticator;
 	private ?Authorizator $authorizator;
 	private ?IIdentity $identity = null;
 	private ?bool $authenticated = null;
@@ -65,7 +65,7 @@ class User
 
 	public function __construct(
 		UserStorage $storage,
-		?IAuthenticator $authenticator = null,
+		?Authenticator $authenticator = null,
 		?Authorizator $authorizator = null,
 	) {
 		$this->storage = $storage;
@@ -95,9 +95,7 @@ public function login(string|IIdentity $user, ?string $password = null): void
 			$this->identity = $user;
 		} else {
 			$authenticator = $this->getAuthenticator();
-			$this->identity = $authenticator instanceof Authenticator
-				? $authenticator->authenticate(...func_get_args())
-				: $authenticator->authenticate(func_get_args());
+			$this->identity = $authenticator->authenticate(...func_get_args());
 		}
 
 		$id = $this->authenticator instanceof IdentityHandler
@@ -188,7 +186,7 @@ final public function refreshStorage(): void
 	/**
 	 * Sets authentication handler.
 	 */
-	public function setAuthenticator(IAuthenticator $handler): static
+	public function setAuthenticator(Authenticator $handler): static
 	{
 		$this->authenticator = $handler;
 		return $this;
@@ -198,7 +196,7 @@ public function setAuthenticator(IAuthenticator $handler): static
 	/**
 	 * Returns authentication handler.
 	 */
-	final public function getAuthenticator(): IAuthenticator
+	final public function getAuthenticator(): Authenticator
 	{
 		if (!$this->authenticator) {
 			throw new Nette\InvalidStateException('Authenticator has not been set.');
@@ -211,7 +209,7 @@ final public function getAuthenticator(): IAuthenticator
 	/**
 	 * Returns authentication handler.
 	 */
-	final public function getAuthenticatorIfExists(): ?IAuthenticator
+	final public function getAuthenticatorIfExists(): ?Authenticator
 	{
 		return $this->authenticator;
 	}