removed I prefixes from IAuthorizator, IResource, IRole

Author: dg

src/Bridges/SecurityDI/SecurityExtension.php

@@ -84,7 +84,7 @@ public function loadConfiguration()
 
 		if ($config->roles || $config->resources) {
 			$authorizator = $builder->addDefinition($this->prefix('authorizator'))
-				->setType(Nette\Security\IAuthorizator::class)
+				->setType(Nette\Security\Authorizator::class)
 				->setFactory(Nette\Security\Permission::class);
 
 			foreach ($config->roles as $role => $parents) {

src/Security/IAuthorizator.php renamed to src/Security/Authorizator.php

@@ -14,7 +14,7 @@
  * Authorizator checks if a given role has authorization
  * to access a given resource.
  */
-interface IAuthorizator
+interface Authorizator
 {
 	/** Set type: all */
 	public const ALL = null;
@@ -33,3 +33,6 @@ interface IAuthorizator
 	 */
 	function isAllowed($role, $resource, $privilege): bool;
 }
+
+
+interface_exists(IAuthorizator::class);

src/Security/Permission.php

@@ -19,7 +19,7 @@
  *
  * @copyright  Copyright (c) 2005, 2007 Zend Technologies USA Inc.
  */
-class Permission implements IAuthorizator
+class Permission implements Authorizator
 {
 	use Nette\SmartObject;
 
@@ -565,24 +565,24 @@ protected function setRule(bool $toAdd, bool $type, $roles, $resources, $privile
 	 * and its respective parents are checked similarly before the lower-priority parents of
 	 * the Role are checked.
 	 *
-	 * @param  string|IRole|null  $role
-	 * @param  string|IResource|null  $resource
+	 * @param  string|Role|null  $role
+	 * @param  string|Resource|null  $resource
 	 * @param  string|null  $privilege
 	 * @throws Nette\InvalidStateException
 	 */
 	public function isAllowed($role = self::ALL, $resource = self::ALL, $privilege = self::ALL): bool
 	{
 		$this->queriedRole = $role;
 		if ($role !== self::ALL) {
-			if ($role instanceof IRole) {
+			if ($role instanceof Role) {
 				$role = $role->getRoleId();
 			}
 			$this->checkRole($role);
 		}
 
 		$this->queriedResource = $resource;
 		if ($resource !== self::ALL) {
-			if ($resource instanceof IResource) {
+			if ($resource instanceof Resource) {
 				$resource = $resource->getResourceId();
 			}
 			$this->checkResource($resource);

src/Security/IResource.php renamed to src/Security/Resource.php

@@ -13,10 +13,13 @@
 /**
  * Represents resource, an object to which access is controlled.
  */
-interface IResource
+interface Resource
 {
 	/**
 	 * Returns a string identifier of the Resource.
 	 */
 	function getResourceId(): string;
 }
+
+
+interface_exists(IResource::class);

src/Security/IRole.php renamed to src/Security/Role.php

@@ -13,10 +13,13 @@
 /**
  * Represents role, an object that may request access to an IResource.
  */
-interface IRole
+interface Role
 {
 	/**
 	 * Returns a string identifier of the Role.
 	 */
 	function getRoleId(): string;
 }
+
+
+interface_exists(IRole::class);

src/Security/User.php

@@ -21,7 +21,7 @@
  * @property-read array $roles
  * @property-read int $logoutReason
  * @property   IAuthenticator $authenticator
- * @property   IAuthorizator $authorizator
+ * @property   Authorizator $authorizator
  */
 class User
 {
@@ -50,7 +50,7 @@ class User
 	/** @var IAuthenticator|null */
 	private $authenticator;
 
-	/** @var IAuthorizator|null */
+	/** @var Authorizator|null */
 	private $authorizator;
 
 	/** @var IIdentity|null */
@@ -63,7 +63,7 @@ class User
 	public function __construct(
 		IUserStorage $storage,
 		IAuthenticator $authenticator = null,
-		IAuthorizator $authorizator = null
+		Authorizator $authorizator = null
 	) {
 		$this->storage = $storage;
 		$this->authenticator = $authenticator;
@@ -270,7 +270,7 @@ final public function isInRole(string $role): bool
 	 * Has a user effective access to the Resource?
 	 * If $resource is null, then the query applies to all resources.
 	 */
-	public function isAllowed($resource = IAuthorizator::ALL, $privilege = IAuthorizator::ALL): bool
+	public function isAllowed($resource = Authorizator::ALL, $privilege = Authorizator::ALL): bool
 	{
 		foreach ($this->getRoles() as $role) {
 			if ($this->getAuthorizator()->isAllowed($role, $resource, $privilege)) {
@@ -286,7 +286,7 @@ public function isAllowed($resource = IAuthorizator::ALL, $privilege = IAuthoriz
 	 * Sets authorization handler.
 	 * @return static
 	 */
-	public function setAuthorizator(IAuthorizator $handler)
+	public function setAuthorizator(Authorizator $handler)
 	{
 		$this->authorizator = $handler;
 		return $this;
@@ -296,7 +296,7 @@ public function setAuthorizator(IAuthorizator $handler)
 	/**
 	 * Returns current authorization handler.
 	 */
-	final public function getAuthorizator(): ?IAuthorizator
+	final public function getAuthorizator(): ?Authorizator
 	{
 		if (func_num_args()) {
 			trigger_error(__METHOD__ . '() parameter $throw is deprecated, use getAuthorizatorIfExists()', E_USER_DEPRECATED);
@@ -312,7 +312,7 @@ final public function getAuthorizator(): ?IAuthorizator
 	/**
 	 * Returns current authorization handler.
 	 */
-	final public function getAuthorizatorIfExists(): ?IAuthorizator
+	final public function getAuthorizatorIfExists(): ?Authorizator
 	{
 		return $this->authorizator;
 	}

src/compatibility.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\Security;
+
+if (false) {
+	/** @deprecated use Nette\Security\Authorizator */
+	interface IAuthorizator extends Authorizator
+	{
+	}
+
+	/** @deprecated use Nette\Security\Resource */
+	interface IResource
+	{
+	}
+
+	/** @deprecated use Nette\Security\Role */
+	interface IRole
+	{
+	}
+} elseif (!interface_exists(IAuthorizator::class)) {
+	class_alias(Authorizator::class, IAuthorizator::class);
+	class_alias(Resource::class, IResource::class);
+	class_alias(Role::class, IRole::class);
+}

tests/Security/User.authorization.phpt

@@ -7,7 +7,6 @@
 declare(strict_types=1);
 
 use Nette\Security\IAuthenticator;
-use Nette\Security\IAuthorizator;
 use Nette\Security\Identity;
 use Tester\Assert;
 
@@ -39,7 +38,7 @@ class Authenticator implements IAuthenticator
 }
 
 
-class Authorizator implements IAuthorizator
+class Authorizator implements Nette\Security\Authorizator
 {
 	public function isAllowed($role = self::ALL, $resource = self::ALL, $privilege = self::ALL): bool
 	{