iqltechnologies / brighty

brighty/vendor/sebastian/comparator/src/ScalarComparator.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     {
         return ((is_scalar($expected) xor null === $expected) &&
                (is_scalar($actual) xor null === $actual))
-               // allow comparison between strings and objects featuring __toString()
+                // allow comparison between strings and objects featuring __toString()
                || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
                || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
     }

brighty/vendor/myth/auth/src/Authorization/FlatAuthorization.php

Indentation +773 added lines, -773 removed lines

@@ -9,778 +9,778 @@
 
 class FlatAuthorization implements AuthorizeInterface
 {
-	/**
-	 * @var array|string|null
-	 */
-	protected $error;
-
-	/**
-	 * The group model to use. Usually the class noted
-	 * below (or an extension thereof) but can be any
-	 * compatible CodeIgniter Model.
-	 *
-	 * @var GroupModel
-	 */
-	protected $groupModel;
-
-	/**
-	 * The group model to use. Usually the class noted
-	 * below (or an extension thereof) but can be any
-	 * compatible CodeIgniter Model.
-	 *
-	 * @var PermissionModel
-	 */
-	protected $permissionModel;
-
-	/**
-	 * The group model to use. Usually the class noted
-	 * below (or an extension thereof) but can be any
-	 * compatible CodeIgniter Model.
-	 *
-	 * @var UserModel
-	 */
-	protected $userModel = null;
-
-	/**
-	 * Stores the models.
-	 *
-	 * @param GroupModel $groupModel
-	 * @param PermissionModel $permissionModel
-	 *
-	 * @return array|string|null
-	 */
-	public function __construct(Model $groupModel, Model $permissionModel)
-	{
-		$this->groupModel      = $groupModel;
-		$this->permissionModel = $permissionModel;
-	}
-
-	/**
-	 * Returns any error(s) from the last call.
-	 *
-	 * @return array|string|null
-	 */
-	public function error()
-	{
-		return $this->error;
-	}
-
-	/**
-	 * Allows the consuming application to pass in a reference to the
-	 * model that should be used.
-	 *
-	 * @param UserModel $model
-	 *
-	 * @return mixed
-	 */
-	public function setUserModel(Model $model)
-	{
-		$this->userModel = $model;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	// Actions
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if a user is in a group.
-	 *
-	 * Groups can be either a string, with the name of the group, an INT
-	 * with the ID of the group, or an array of strings/ids that the
-	 * user must belong to ONE of. (It's an OR check not an AND check)
-	 *
-	 * @param mixed $groups
-	 * @param int $userId
-	 *
-	 * @return bool
-	 */
-	public function inGroup($groups, int $userId)
-	{
-		if ($userId === 0)
-		{
-			return false;
-		}
-
-		if (! is_array($groups))
-		{
-			$groups = [$groups];
-		}
-
-		$userGroups = $this->groupModel->getGroupsForUser((int) $userId);
-
-		if (empty($userGroups))
-		{
-			return false;
-		}
-
-		foreach ($groups as $group)
-		{
-			if (is_numeric($group))
-			{
-				$ids = array_column($userGroups, 'group_id');
-				if (in_array($group, $ids))
-				{
-					return true;
-				}
-			}
-			else if (is_string($group))
-			{
-				$names = array_column($userGroups, 'name');
-
-				if (in_array($group, $names))
-				{
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks a user's groups to see if they have the specified permission.
-	 *
-	 * @param int|string $permission Permission ID or name
-	 * @param int $userId
-	 *
-	 * @return mixed
-	 */
-	public function hasPermission($permission, int $userId)
-	{
-		// @phpstan-ignore-next-line
-		if (empty($permission) || (! is_string($permission) && ! is_numeric($permission)))
-		{
-			return null;
-		}
-
-		if (empty($userId) || ! is_numeric($userId))
-		{
-			return null;
-		}
-
-		// Get the Permission ID
-		$permissionId = $this->getPermissionID($permission);
-
-		if (! is_numeric($permissionId))
-		{
-			return false;
-		}
-
-		// First check the permission model. If that exists, then we're golden.
-		if ($this->permissionModel->doesUserHavePermission($userId, (int)$permissionId))
-		{
-			return true;
-		}
-
-		// Still here? Then we have one last check to make - any user private permissions.
-		return $this->doesUserHavePermission($userId, (int)$permissionId);
-	}
-
-	/**
-	 * Makes a member a part of a group.
-	 *
-	 * @param int $userid
-	 * @param mixed $group Either ID or name, fails on anything else
-	 *
-	 * @return bool|null
-	 */
-	public function addUserToGroup(int $userid, $group)
-	{
-		if (empty($userid) || ! is_numeric($userid))
-		{
-			return null;
-		}
-
-		if (empty($group) || (! is_numeric($group) && ! is_string($group)))
-		{
-			return null;
-		}
-
-		$groupId = $this->getGroupID($group);
-
-		if (! Events::trigger('beforeAddUserToGroup', $userid, $groupId))
-		{
-			return false;
-		}
-
-		// Group ID
-		if (! is_numeric($groupId))
-		{
-			return null;
-		}
-
-		if (! $this->groupModel->addUserToGroup($userid, (int) $groupId))
-		{
-			$this->error = $this->groupModel->errors();
-
-			return false;
-		}
-
-		Events::trigger('didAddUserToGroup', $userid, $groupId);
-
-		return true;
-	}
-
-	/**
-	 * Removes a single user from a group.
-	 *
-	 * @param int $userId
-	 * @param mixed $group
-	 *
-	 * @return mixed
-	 */
-	public function removeUserFromGroup(int $userId, $group)
-	{
-		if (empty($userId) || ! is_numeric($userId))
-		{
-			return null;
-		}
-
-		if (empty($group) || (! is_numeric($group) && ! is_string($group)))
-		{
-			return null;
-		}
-
-		$groupId = $this->getGroupID($group);
-
-		if (! Events::trigger('beforeRemoveUserFromGroup', $userId, $groupId))
-		{
-			return false;
-		}
-
-		// Group ID
-		if (! is_numeric($groupId))
-		{
-			return false;
-		}
-
-		if (! $this->groupModel->removeUserFromGroup($userId, $groupId))
-		{
-			$this->error = $this->groupModel->errors();
-
-			return false;
-		}
-
-		Events::trigger('didRemoveUserFromGroup', $userId, $groupId);
-
-		return true;
-	}
-
-	/**
-	 * Adds a single permission to a single group.
-	 *
-	 * @param int|string $permission
-	 * @param int|string $group
-	 *
-	 * @return mixed
-	 */
-	public function addPermissionToGroup($permission, $group)
-	{
-		$permissionId = $this->getPermissionID($permission);
-		$groupId = $this->getGroupID($group);
-
-		// Permission ID
-		if (! is_numeric($permissionId))
-		{
-			return false;
-		}
-
-		// Group ID
-		if (! is_numeric($groupId))
-		{
-			return false;
-		}
-
-		// Remove it!
-		if (! $this->groupModel->addPermissionToGroup($permissionId, $groupId))
-		{
-			$this->error = $this->groupModel->errors();
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Removes a single permission from a group.
-	 *
-	 * @param int|string $permission
-	 * @param int|string $group
-	 *
-	 * @return mixed
-	 */
-	public function removePermissionFromGroup($permission, $group)
-	{
-		$permissionId = $this->getPermissionID($permission);
-		$groupId = $this->getGroupID($group);
-
-		// Permission ID
-		if (! is_numeric($permissionId))
-		{
-			return false;
-		}
-
-		// Group ID
-		if (! is_numeric($groupId))
-		{
-			return false;
-		}
-
-		// Remove it!
-		if (! $this->groupModel->removePermissionFromGroup($permissionId, $groupId))
-		{
-			$this->error = $this->groupModel->errors();
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Assigns a single permission to a user, irregardless of permissions
-	 * assigned by roles. This is saved to the user's meta information.
-	 *
-	 * @param int|string $permission
-	 * @param int		$userId
-	 *
-	 * @return bool|null
-	 */
-	public function addPermissionToUser($permission, int $userId)
-	{
-		$permissionId = $this->getPermissionID($permission);
-
-		if (! is_numeric($permissionId))
-		{
-			return null;
-		}
-
-		if (! Events::trigger('beforeAddPermissionToUser', $userId, $permissionId))
-		{
-			return false;
-		}
-
-		$user = $this->userModel->find($userId);
-
-		if (! $user)
-		{
-			$this->error = lang('Auth.userNotFound', [$userId]);
-			return false;
-		}
-
-		/** @var User $user */
-		$permissions = $user->getPermissions();
-
-		if (! in_array($permissionId, $permissions))
-		{
-			$this->permissionModel->addPermissionToUser($permissionId, $user->id);
-		}
-
-		Events::trigger('didAddPermissionToUser', $userId, $permissionId);
-
-		return true;
-	}
-
-	/**
-	 * Removes a single permission from a user. Only applies to permissions
-	 * that have been assigned with addPermissionToUser, not to permissions
-	 * inherited based on groups they belong to.
-	 *
-	 * @param int|string $permission
-	 * @param int $userId
-	 *
-	 * @return bool|mixed|null
-	 */
-	public function removePermissionFromUser($permission, int $userId)
-	{
-		$permissionId = $this->getPermissionID($permission);
-
-		if (! is_numeric($permissionId))
-		{
-			return false;
-		}
-
-		if (empty($userId) || ! is_numeric($userId))
-		{
-			return null;
-		}
-
-		$userId = (int)$userId;
-
-		if (! Events::trigger('beforeRemovePermissionFromUser', $userId, $permissionId))
-		{
-			return false;
-		}
-
-		return $this->permissionModel->removePermissionFromUser($permissionId, $userId);
-	}
-
-	/**
-	 * Checks to see if a user has private permission assigned to it.
-	 *
-	 * @param int|string $userId
-	 * @param int|string $permission
-	 *
-	 * @return bool|null
-	 */
-	public function doesUserHavePermission($userId, $permission)
-	{
-		$permissionId = $this->getPermissionID($permission);
-
-		if (! is_numeric($permissionId))
-		{
-			return false;
-		}
-
-		if (empty($userId) || ! is_numeric($userId))
-		{
-			return null;
-		}
-
-		return $this->permissionModel->doesUserHavePermission($userId, $permissionId);
-	}
-
-	//--------------------------------------------------------------------
-	// Groups
-	//--------------------------------------------------------------------
-
-	/**
-	 * Grabs the details about a single group.
-	 *
-	 * @param int|string $group
-	 *
-	 * @return object|null
-	 */
-	public function group($group)
-	{
-		if (is_numeric($group))
-		{
-			return $this->groupModel->find((int) $group);
-		}
-
-		return $this->groupModel->where('name', $group)->first();
-	}
-
-	/**
-	 * Grabs an array of all groups.
-	 *
-	 * @return array of objects
-	 */
-	public function groups()
-	{
-		return $this->groupModel
-			->orderBy('name', 'asc')
-			->findAll();
-	}
-
-
-	/**
-	 * @param string $name
-	 * @param string $description
-	 *
-	 * @return mixed
-	 */
-	public function createGroup(string $name, string $description = '')
-	{
-		$data = [
-			'name'		=> $name,
-			'description' => $description,
-		];
-
-		$validation = service('validation', null, false);
-		$validation->setRules([
-			'name'		=> 'required|max_length[255]|is_unique[auth_groups.name]',
-			'description' => 'max_length[255]',
-		]);
-
-		if (! $validation->run($data))
-		{
-			$this->error = $validation->getErrors();
-			return false;
-		}
-
-		$id = $this->groupModel->skipValidation()->insert($data);
-
-		if (is_numeric($id))
-		{
-			return (int)$id;
-		}
-
-		$this->error = $this->groupModel->errors();
-
-		return false;
-	}
-
-	/**
-	 * Deletes a single group.
-	 *
-	 * @param int $groupId
-	 *
-	 * @return bool
-	 */
-	public function deleteGroup(int $groupId)
-	{
-		if (! $this->groupModel->delete($groupId))
-		{
-			$this->error = $this->groupModel->errors();
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Updates a single group's information.
-	 *
-	 * @param int $id
-	 * @param string $name
-	 * @param string $description
-	 *
-	 * @return mixed
-	 */
-	public function updateGroup(int $id, string $name, string $description = '')
-	{
-		$data = [
-			'name' => $name,
-		];
-
-		if (! empty($description))
-		{
-			$data['description'] = $description;
-		}
-
-		if (! $this->groupModel->update($id, $data))
-		{
-			$this->error = $this->groupModel->errors();
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Given a group, will return the group ID. The group can be either
-	 * the ID or the name of the group.
-	 *
-	 * @param int|string $group
-	 *
-	 * @return int|false
-	 */
-	protected function getGroupID($group)
-	{
-		if (is_numeric($group))
-		{
-			return (int)$group;
-		}
-
-		$g = $this->groupModel->where('name', $group)->first();
-
-		if (! $g)
-		{
-			$this->error = lang('Auth.groupNotFound', [$group]);
-
-			return false;
-		}
-
-		return (int)$g->id;
-	}
-
-	//--------------------------------------------------------------------
-	// Permissions
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the details about a single permission.
-	 *
-	 * @param int|string $permission
-	 *
-	 * @return object|null
-	 */
-	public function permission($permission)
-	{
-		if (is_numeric($permission))
-		{
-			return $this->permissionModel->find((int)$permission);
-		}
-
-		return $this->permissionModel->like('name', $permission, 'none', null, true)->first();
-	}
-
-	/**
-	 * Returns an array of all permissions in the system.
-	 *
-	 * @return mixed
-	 */
-	public function permissions()
-	{
-		return $this->permissionModel->findAll();
-	}
-
-	/**
-	 * Creates a single permission.
-	 *
-	 * @param string $name
-	 * @param string $description
-	 *
-	 * @return mixed
-	 */
-	public function createPermission(string $name, string $description = '')
-	{
-		$data = [
-			'name'		=> $name,
-			'description' => $description,
-		];
-
-		$validation = service('validation', null, false);
-		$validation->setRules([
-			'name'		=> 'required|max_length[255]|is_unique[auth_permissions.name]',
-			'description' => 'max_length[255]',
-		]);
-
-		if (! $validation->run($data))
-		{
-			$this->error = $validation->getErrors();
-			return false;
-		}
-
-		$id = $this->permissionModel->skipValidation()->insert($data);
-
-		if (is_numeric($id))
-		{
-			return (int)$id;
-		}
-
-		$this->error = $this->permissionModel->errors();
-
-		return false;
-	}
-
-	/**
-	 * Deletes a single permission and removes that permission from all groups.
-	 *
-	 * @param int $permissionIdId
-	 *
-	 * @return mixed
-	 */
-	public function deletePermission(int $permissionIdId)
-	{
-		if (! $this->permissionModel->delete($permissionIdId))
-		{
-			$this->error = $this->permissionModel->errors();
-
-			return false;
-		}
-
-		// Remove the permission from all groups
-		$this->groupModel->removePermissionFromAllGroups($permissionIdId);
-
-		return true;
-	}
-
-	/**
-	 * Updates the details for a single permission.
-	 *
-	 * @param int $id
-	 * @param string $name
-	 * @param string $description
-	 *
-	 * @return bool
-	 */
-	public function updatePermission(int $id, string $name, string $description = '')
-	{
-		$data = [
-			'name' => $name,
-		];
-
-		if (! empty($description))
-		{
-			$data['description'] = $description;
-		}
-
-		if (! $this->permissionModel->update((int)$id, $data))
-		{
-			$this->error = $this->permissionModel->errors();
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Verifies that a permission (either ID or the name) exists and returns
-	 * the permission ID.
-	 *
-	 * @param int|string $permission
-	 *
-	 * @return int|false
-	 */
-	protected function getPermissionID($permission)
-	{
-		// If it's a number, we're done here.
-		if (is_numeric($permission))
-		{
-			return (int) $permission;
-		}
-
-		// Otherwise, pull it from the database.
-		$p = $this->permissionModel->asObject()->where('name', $permission)->first();
-
-		if (! $p)
-		{
-			$this->error = lang('Auth.permissionNotFound', [$permission]);
-
-			return false;
-		}
-
-		return (int) $p->id;
-	}
-
-	/**
-	 * Returns an array of all permissions in the system for a group
-	 * The group can be either the ID or the name of the group.
-	 *
-	 * @param int|string $group
-	 *
-	 * @return mixed
-	 */
-	public function groupPermissions($group)
-	{
-		if (is_numeric($group))
-		{
-			return $this->groupModel->getPermissionsForGroup($group);
-		}
-		else
-		{
-			$g = $this->groupModel->where('name', $group)->first();
-			return $this->groupModel->getPermissionsForGroup($g->id);
-		}
-	}
-
-	/**
-	 * Returns an array of all users in a group
-	 * The group can be either the ID or the name of the group.
-	 *
-	 * @param int|string $group
-	 *
-	 * @return mixed
-	 */
-	public function usersInGroup($group)
-	{
-		if (is_numeric($group))
-		{
-			return $this->groupModel->getUsersForGroup($group);
-		}
-		else
-		{
-			$g = $this->groupModel->where('name', $group)->first();
-			return $this->groupModel->getUsersForGroup($g->id);
-		}
-	}
+    /**
+     * @var array|string|null
+     */
+    protected $error;
+
+    /**
+     * The group model to use. Usually the class noted
+     * below (or an extension thereof) but can be any
+     * compatible CodeIgniter Model.
+     *
+     * @var GroupModel
+     */
+    protected $groupModel;
+
+    /**
+     * The group model to use. Usually the class noted
+     * below (or an extension thereof) but can be any
+     * compatible CodeIgniter Model.
+     *
+     * @var PermissionModel
+     */
+    protected $permissionModel;
+
+    /**
+     * The group model to use. Usually the class noted
+     * below (or an extension thereof) but can be any
+     * compatible CodeIgniter Model.
+     *
+     * @var UserModel
+     */
+    protected $userModel = null;
+
+    /**
+     * Stores the models.
+     *
+     * @param GroupModel $groupModel
+     * @param PermissionModel $permissionModel
+     *
+     * @return array|string|null
+     */
+    public function __construct(Model $groupModel, Model $permissionModel)
+    {
+        $this->groupModel      = $groupModel;
+        $this->permissionModel = $permissionModel;
+    }
+
+    /**
+     * Returns any error(s) from the last call.
+     *
+     * @return array|string|null
+     */
+    public function error()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Allows the consuming application to pass in a reference to the
+     * model that should be used.
+     *
+     * @param UserModel $model
+     *
+     * @return mixed
+     */
+    public function setUserModel(Model $model)
+    {
+        $this->userModel = $model;
+
+        return $this;
+    }
+
+    //--------------------------------------------------------------------
+    // Actions
+    //--------------------------------------------------------------------
+
+    /**
+     * Checks to see if a user is in a group.
+     *
+     * Groups can be either a string, with the name of the group, an INT
+     * with the ID of the group, or an array of strings/ids that the
+     * user must belong to ONE of. (It's an OR check not an AND check)
+     *
+     * @param mixed $groups
+     * @param int $userId
+     *
+     * @return bool
+     */
+    public function inGroup($groups, int $userId)
+    {
+        if ($userId === 0)
+        {
+            return false;
+        }
+
+        if (! is_array($groups))
+        {
+            $groups = [$groups];
+        }
+
+        $userGroups = $this->groupModel->getGroupsForUser((int) $userId);
+
+        if (empty($userGroups))
+        {
+            return false;
+        }
+
+        foreach ($groups as $group)
+        {
+            if (is_numeric($group))
+            {
+                $ids = array_column($userGroups, 'group_id');
+                if (in_array($group, $ids))
+                {
+                    return true;
+                }
+            }
+            else if (is_string($group))
+            {
+                $names = array_column($userGroups, 'name');
+
+                if (in_array($group, $names))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks a user's groups to see if they have the specified permission.
+     *
+     * @param int|string $permission Permission ID or name
+     * @param int $userId
+     *
+     * @return mixed
+     */
+    public function hasPermission($permission, int $userId)
+    {
+        // @phpstan-ignore-next-line
+        if (empty($permission) || (! is_string($permission) && ! is_numeric($permission)))
+        {
+            return null;
+        }
+
+        if (empty($userId) || ! is_numeric($userId))
+        {
+            return null;
+        }
+
+        // Get the Permission ID
+        $permissionId = $this->getPermissionID($permission);
+
+        if (! is_numeric($permissionId))
+        {
+            return false;
+        }
+
+        // First check the permission model. If that exists, then we're golden.
+        if ($this->permissionModel->doesUserHavePermission($userId, (int)$permissionId))
+        {
+            return true;
+        }
+
+        // Still here? Then we have one last check to make - any user private permissions.
+        return $this->doesUserHavePermission($userId, (int)$permissionId);
+    }
+
+    /**
+     * Makes a member a part of a group.
+     *
+     * @param int $userid
+     * @param mixed $group Either ID or name, fails on anything else
+     *
+     * @return bool|null
+     */
+    public function addUserToGroup(int $userid, $group)
+    {
+        if (empty($userid) || ! is_numeric($userid))
+        {
+            return null;
+        }
+
+        if (empty($group) || (! is_numeric($group) && ! is_string($group)))
+        {
+            return null;
+        }
+
+        $groupId = $this->getGroupID($group);
+
+        if (! Events::trigger('beforeAddUserToGroup', $userid, $groupId))
+        {
+            return false;
+        }
+
+        // Group ID
+        if (! is_numeric($groupId))
+        {
+            return null;
+        }
+
+        if (! $this->groupModel->addUserToGroup($userid, (int) $groupId))
+        {
+            $this->error = $this->groupModel->errors();
+
+            return false;
+        }
+
+        Events::trigger('didAddUserToGroup', $userid, $groupId);
+
+        return true;
+    }
+
+    /**
+     * Removes a single user from a group.
+     *
+     * @param int $userId
+     * @param mixed $group
+     *
+     * @return mixed
+     */
+    public function removeUserFromGroup(int $userId, $group)
+    {
+        if (empty($userId) || ! is_numeric($userId))
+        {
+            return null;
+        }
+
+        if (empty($group) || (! is_numeric($group) && ! is_string($group)))
+        {
+            return null;
+        }
+
+        $groupId = $this->getGroupID($group);
+
+        if (! Events::trigger('beforeRemoveUserFromGroup', $userId, $groupId))
+        {
+            return false;
+        }
+
+        // Group ID
+        if (! is_numeric($groupId))
+        {
+            return false;
+        }
+
+        if (! $this->groupModel->removeUserFromGroup($userId, $groupId))
+        {
+            $this->error = $this->groupModel->errors();
+
+            return false;
+        }
+
+        Events::trigger('didRemoveUserFromGroup', $userId, $groupId);
+
+        return true;
+    }
+
+    /**
+     * Adds a single permission to a single group.
+     *
+     * @param int|string $permission
+     * @param int|string $group
+     *
+     * @return mixed
+     */
+    public function addPermissionToGroup($permission, $group)
+    {
+        $permissionId = $this->getPermissionID($permission);
+        $groupId = $this->getGroupID($group);
+
+        // Permission ID
+        if (! is_numeric($permissionId))
+        {
+            return false;
+        }
+
+        // Group ID
+        if (! is_numeric($groupId))
+        {
+            return false;
+        }
+
+        // Remove it!
+        if (! $this->groupModel->addPermissionToGroup($permissionId, $groupId))
+        {
+            $this->error = $this->groupModel->errors();
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Removes a single permission from a group.
+     *
+     * @param int|string $permission
+     * @param int|string $group
+     *
+     * @return mixed
+     */
+    public function removePermissionFromGroup($permission, $group)
+    {
+        $permissionId = $this->getPermissionID($permission);
+        $groupId = $this->getGroupID($group);
+
+        // Permission ID
+        if (! is_numeric($permissionId))
+        {
+            return false;
+        }
+
+        // Group ID
+        if (! is_numeric($groupId))
+        {
+            return false;
+        }
+
+        // Remove it!
+        if (! $this->groupModel->removePermissionFromGroup($permissionId, $groupId))
+        {
+            $this->error = $this->groupModel->errors();
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Assigns a single permission to a user, irregardless of permissions
+     * assigned by roles. This is saved to the user's meta information.
+     *
+     * @param int|string $permission
+     * @param int		$userId
+     *
+     * @return bool|null
+     */
+    public function addPermissionToUser($permission, int $userId)
+    {
+        $permissionId = $this->getPermissionID($permission);
+
+        if (! is_numeric($permissionId))
+        {
+            return null;
+        }
+
+        if (! Events::trigger('beforeAddPermissionToUser', $userId, $permissionId))
+        {
+            return false;
+        }
+
+        $user = $this->userModel->find($userId);
+
+        if (! $user)
+        {
+            $this->error = lang('Auth.userNotFound', [$userId]);
+            return false;
+        }
+
+        /** @var User $user */
+        $permissions = $user->getPermissions();
+
+        if (! in_array($permissionId, $permissions))
+        {
+            $this->permissionModel->addPermissionToUser($permissionId, $user->id);
+        }
+
+        Events::trigger('didAddPermissionToUser', $userId, $permissionId);
+
+        return true;
+    }
+
+    /**
+     * Removes a single permission from a user. Only applies to permissions
+     * that have been assigned with addPermissionToUser, not to permissions
+     * inherited based on groups they belong to.
+     *
+     * @param int|string $permission
+     * @param int $userId
+     *
+     * @return bool|mixed|null
+     */
+    public function removePermissionFromUser($permission, int $userId)
+    {
+        $permissionId = $this->getPermissionID($permission);
+
+        if (! is_numeric($permissionId))
+        {
+            return false;
+        }
+
+        if (empty($userId) || ! is_numeric($userId))
+        {
+            return null;
+        }
+
+        $userId = (int)$userId;
+
+        if (! Events::trigger('beforeRemovePermissionFromUser', $userId, $permissionId))
+        {
+            return false;
+        }
+
+        return $this->permissionModel->removePermissionFromUser($permissionId, $userId);
+    }
+
+    /**
+     * Checks to see if a user has private permission assigned to it.
+     *
+     * @param int|string $userId
+     * @param int|string $permission
+     *
+     * @return bool|null
+     */
+    public function doesUserHavePermission($userId, $permission)
+    {
+        $permissionId = $this->getPermissionID($permission);
+
+        if (! is_numeric($permissionId))
+        {
+            return false;
+        }
+
+        if (empty($userId) || ! is_numeric($userId))
+        {
+            return null;
+        }
+
+        return $this->permissionModel->doesUserHavePermission($userId, $permissionId);
+    }
+
+    //--------------------------------------------------------------------
+    // Groups
+    //--------------------------------------------------------------------
+
+    /**
+     * Grabs the details about a single group.
+     *
+     * @param int|string $group
+     *
+     * @return object|null
+     */
+    public function group($group)
+    {
+        if (is_numeric($group))
+        {
+            return $this->groupModel->find((int) $group);
+        }
+
+        return $this->groupModel->where('name', $group)->first();
+    }
+
+    /**
+     * Grabs an array of all groups.
+     *
+     * @return array of objects
+     */
+    public function groups()
+    {
+        return $this->groupModel
+            ->orderBy('name', 'asc')
+            ->findAll();
+    }
+
+
+    /**
+     * @param string $name
+     * @param string $description
+     *
+     * @return mixed
+     */
+    public function createGroup(string $name, string $description = '')
+    {
+        $data = [
+            'name'		=> $name,
+            'description' => $description,
+        ];
+
+        $validation = service('validation', null, false);
+        $validation->setRules([
+            'name'		=> 'required|max_length[255]|is_unique[auth_groups.name]',
+            'description' => 'max_length[255]',
+        ]);
+
+        if (! $validation->run($data))
+        {
+            $this->error = $validation->getErrors();
+            return false;
+        }
+
+        $id = $this->groupModel->skipValidation()->insert($data);
+
+        if (is_numeric($id))
+        {
+            return (int)$id;
+        }
+
+        $this->error = $this->groupModel->errors();
+
+        return false;
+    }
+
+    /**
+     * Deletes a single group.
+     *
+     * @param int $groupId
+     *
+     * @return bool
+     */
+    public function deleteGroup(int $groupId)
+    {
+        if (! $this->groupModel->delete($groupId))
+        {
+            $this->error = $this->groupModel->errors();
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Updates a single group's information.
+     *
+     * @param int $id
+     * @param string $name
+     * @param string $description
+     *
+     * @return mixed
+     */
+    public function updateGroup(int $id, string $name, string $description = '')
+    {
+        $data = [
+            'name' => $name,
+        ];
+
+        if (! empty($description))
+        {
+            $data['description'] = $description;
+        }
+
+        if (! $this->groupModel->update($id, $data))
+        {
+            $this->error = $this->groupModel->errors();
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Given a group, will return the group ID. The group can be either
+     * the ID or the name of the group.
+     *
+     * @param int|string $group
+     *
+     * @return int|false
+     */
+    protected function getGroupID($group)
+    {
+        if (is_numeric($group))
+        {
+            return (int)$group;
+        }
+
+        $g = $this->groupModel->where('name', $group)->first();
+
+        if (! $g)
+        {
+            $this->error = lang('Auth.groupNotFound', [$group]);
+
+            return false;
+        }
+
+        return (int)$g->id;
+    }
+
+    //--------------------------------------------------------------------
+    // Permissions
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns the details about a single permission.
+     *
+     * @param int|string $permission
+     *
+     * @return object|null
+     */
+    public function permission($permission)
+    {
+        if (is_numeric($permission))
+        {
+            return $this->permissionModel->find((int)$permission);
+        }
+
+        return $this->permissionModel->like('name', $permission, 'none', null, true)->first();
+    }
+
+    /**
+     * Returns an array of all permissions in the system.
+     *
+     * @return mixed
+     */
+    public function permissions()
+    {
+        return $this->permissionModel->findAll();
+    }
+
+    /**
+     * Creates a single permission.
+     *
+     * @param string $name
+     * @param string $description
+     *
+     * @return mixed
+     */
+    public function createPermission(string $name, string $description = '')
+    {
+        $data = [
+            'name'		=> $name,
+            'description' => $description,
+        ];
+
+        $validation = service('validation', null, false);
+        $validation->setRules([
+            'name'		=> 'required|max_length[255]|is_unique[auth_permissions.name]',
+            'description' => 'max_length[255]',
+        ]);
+
+        if (! $validation->run($data))
+        {
+            $this->error = $validation->getErrors();
+            return false;
+        }
+
+        $id = $this->permissionModel->skipValidation()->insert($data);
+
+        if (is_numeric($id))
+        {
+            return (int)$id;
+        }
+
+        $this->error = $this->permissionModel->errors();
+
+        return false;
+    }
+
+    /**
+     * Deletes a single permission and removes that permission from all groups.
+     *
+     * @param int $permissionIdId
+     *
+     * @return mixed
+     */
+    public function deletePermission(int $permissionIdId)
+    {
+        if (! $this->permissionModel->delete($permissionIdId))
+        {
+            $this->error = $this->permissionModel->errors();
+
+            return false;
+        }
+
+        // Remove the permission from all groups
+        $this->groupModel->removePermissionFromAllGroups($permissionIdId);
+
+        return true;
+    }
+
+    /**
+     * Updates the details for a single permission.
+     *
+     * @param int $id
+     * @param string $name
+     * @param string $description
+     *
+     * @return bool
+     */
+    public function updatePermission(int $id, string $name, string $description = '')
+    {
+        $data = [
+            'name' => $name,
+        ];
+
+        if (! empty($description))
+        {
+            $data['description'] = $description;
+        }
+
+        if (! $this->permissionModel->update((int)$id, $data))
+        {
+            $this->error = $this->permissionModel->errors();
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Verifies that a permission (either ID or the name) exists and returns
+     * the permission ID.
+     *
+     * @param int|string $permission
+     *
+     * @return int|false
+     */
+    protected function getPermissionID($permission)
+    {
+        // If it's a number, we're done here.
+        if (is_numeric($permission))
+        {
+            return (int) $permission;
+        }
+
+        // Otherwise, pull it from the database.
+        $p = $this->permissionModel->asObject()->where('name', $permission)->first();
+
+        if (! $p)
+        {
+            $this->error = lang('Auth.permissionNotFound', [$permission]);
+
+            return false;
+        }
+
+        return (int) $p->id;
+    }
+
+    /**
+     * Returns an array of all permissions in the system for a group
+     * The group can be either the ID or the name of the group.
+     *
+     * @param int|string $group
+     *
+     * @return mixed
+     */
+    public function groupPermissions($group)
+    {
+        if (is_numeric($group))
+        {
+            return $this->groupModel->getPermissionsForGroup($group);
+        }
+        else
+        {
+            $g = $this->groupModel->where('name', $group)->first();
+            return $this->groupModel->getPermissionsForGroup($g->id);
+        }
+    }
+
+    /**
+     * Returns an array of all users in a group
+     * The group can be either the ID or the name of the group.
+     *
+     * @param int|string $group
+     *
+     * @return mixed
+     */
+    public function usersInGroup($group)
+    {
+        if (is_numeric($group))
+        {
+            return $this->groupModel->getUsersForGroup($group);
+        }
+        else
+        {
+            $g = $this->groupModel->where('name', $group)->first();
+            return $this->groupModel->getUsersForGroup($g->id);
+        }
+    }
 
 }

brighty/vendor/myth/auth/src/Config/Services.php

Indentation +95 added lines, -95 removed lines

@@ -17,99 +17,99 @@
 
 class Services extends BaseService
 {
-	public static function authentication(string $lib = 'local', Model $userModel = null, Model $loginModel = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return self::getSharedInstance('authentication', $lib, $userModel, $loginModel);
-		}
-
-		$userModel  = $userModel ?? model(UserModel::class);
-		$loginModel = $loginModel ?? model(LoginModel::class);
-
-		/** @var AuthConfig $config */
-		$config   = config('Auth');
-		$class	  = $config->authenticationLibs[$lib];
-		$instance = new $class($config);
-
-		return $instance
-			->setUserModel($userModel)
-			->setLoginModel($loginModel);
-	}
-
-	public static function authorization(Model $groupModel = null, Model $permissionModel = null, Model $userModel = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return self::getSharedInstance('authorization', $groupModel, $permissionModel, $userModel);
-		}
-
-		$groupModel	     = $groupModel ?? model(GroupModel::class);
-		$permissionModel = $permissionModel ?? model(PermissionModel::class);
-		$userModel	     = $userModel ?? model(UserModel::class);
-
-		$instance = new FlatAuthorization($groupModel, $permissionModel);
-
-		return $instance->setUserModel($userModel);
-	}
-
-	/**
-	 * Returns an instance of the PasswordValidator.
-	 *
-	 * @param AuthConfig|null $config
-	 * @param bool      $getShared
-	 *
-	 * @return PasswordValidator
-	 */
-	public static function passwords(AuthConfig $config = null, bool $getShared = true): PasswordValidator
-	{
-		if ($getShared)
-		{
-			return self::getSharedInstance('passwords', $config);
-		}
-
-		return new PasswordValidator($config ?? config(AuthConfig::class));
-	}
-
-	/**
-	 * Returns an instance of the Activator.
-	 *
-	 * @param AuthConfig|null $config
-	 * @param bool      $getShared
-	 *
-	 * @return ActivatorInterface
-	 */
-	public static function activator(AuthConfig $config = null, bool $getShared = true): ActivatorInterface
-	{
-		if ($getShared)
-		{
-			return self::getSharedInstance('activator', $config);
-		}
-
-		$config = $config ?? config(AuthConfig::class);
-		$class	= $config->requireActivation ?? UserActivator::class;
-
-		return new $class($config);
-	}
-
-	/**
-	 * Returns an instance of the Resetter.
-	 *
-	 * @param AuthConfig|null $config
-	 * @param bool      $getShared
-	 *
-	 * @return ResetterInterface
-	 */
-	public static function resetter(AuthConfig $config = null, bool $getShared = true): ResetterInterface
-	{
-		if ($getShared)
-		{
-			return self::getSharedInstance('resetter', $config);
-		}
-
-		$config = $config ?? config(AuthConfig::class);
-		$class	= $config->activeResetter ?? EmailResetter::class;
-
-		return new $class($config);
-	}
+    public static function authentication(string $lib = 'local', Model $userModel = null, Model $loginModel = null, bool $getShared = true)
+    {
+        if ($getShared)
+        {
+            return self::getSharedInstance('authentication', $lib, $userModel, $loginModel);
+        }
+
+        $userModel  = $userModel ?? model(UserModel::class);
+        $loginModel = $loginModel ?? model(LoginModel::class);
+
+        /** @var AuthConfig $config */
+        $config   = config('Auth');
+        $class	  = $config->authenticationLibs[$lib];
+        $instance = new $class($config);
+
+        return $instance
+            ->setUserModel($userModel)
+            ->setLoginModel($loginModel);
+    }
+
+    public static function authorization(Model $groupModel = null, Model $permissionModel = null, Model $userModel = null, bool $getShared = true)
+    {
+        if ($getShared)
+        {
+            return self::getSharedInstance('authorization', $groupModel, $permissionModel, $userModel);
+        }
+
+        $groupModel	     = $groupModel ?? model(GroupModel::class);
+        $permissionModel = $permissionModel ?? model(PermissionModel::class);
+        $userModel	     = $userModel ?? model(UserModel::class);
+
+        $instance = new FlatAuthorization($groupModel, $permissionModel);
+
+        return $instance->setUserModel($userModel);
+    }
+
+    /**
+     * Returns an instance of the PasswordValidator.
+     *
+     * @param AuthConfig|null $config
+     * @param bool      $getShared
+     *
+     * @return PasswordValidator
+     */
+    public static function passwords(AuthConfig $config = null, bool $getShared = true): PasswordValidator
+    {
+        if ($getShared)
+        {
+            return self::getSharedInstance('passwords', $config);
+        }
+
+        return new PasswordValidator($config ?? config(AuthConfig::class));
+    }
+
+    /**
+     * Returns an instance of the Activator.
+     *
+     * @param AuthConfig|null $config
+     * @param bool      $getShared
+     *
+     * @return ActivatorInterface
+     */
+    public static function activator(AuthConfig $config = null, bool $getShared = true): ActivatorInterface
+    {
+        if ($getShared)
+        {
+            return self::getSharedInstance('activator', $config);
+        }
+
+        $config = $config ?? config(AuthConfig::class);
+        $class	= $config->requireActivation ?? UserActivator::class;
+
+        return new $class($config);
+    }
+
+    /**
+     * Returns an instance of the Resetter.
+     *
+     * @param AuthConfig|null $config
+     * @param bool      $getShared
+     *
+     * @return ResetterInterface
+     */
+    public static function resetter(AuthConfig $config = null, bool $getShared = true): ResetterInterface
+    {
+        if ($getShared)
+        {
+            return self::getSharedInstance('resetter', $config);
+        }
+
+        $config = $config ?? config(AuthConfig::class);
+        $class	= $config->activeResetter ?? EmailResetter::class;
+
+        return new $class($config);
+    }
 }

brighty/vendor/myth/auth/src/Config/Auth.php

Indentation +294 added lines, -294 removed lines

@@ -4,220 +4,220 @@ 
 
 class Auth extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------
-	 * Default User Group
-	 * --------------------------------------------------------------------
-	 *
-	 * The name of a group a user will be added to when they register,
-	 * i.e. $defaultUserGroup = 'guests'.
-	 *
-	 * @var string
-	 */
-	public $defaultUserGroup;
+    /**
+     * --------------------------------------------------------------------
+     * Default User Group
+     * --------------------------------------------------------------------
+     *
+     * The name of a group a user will be added to when they register,
+     * i.e. $defaultUserGroup = 'guests'.
+     *
+     * @var string
+     */
+    public $defaultUserGroup;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Libraries
-	 * --------------------------------------------------------------------
-	 *
-	 * @var array
-	 */
-	public $authenticationLibs = [
-		'local' => 'Myth\Auth\Authentication\LocalAuthenticator',
-	];
+    /**
+     * --------------------------------------------------------------------
+     * Libraries
+     * --------------------------------------------------------------------
+     *
+     * @var array
+     */
+    public $authenticationLibs = [
+        'local' => 'Myth\Auth\Authentication\LocalAuthenticator',
+    ];
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Views used by Auth Controllers
-	 * --------------------------------------------------------------------
-	 *
-	 * @var array
-	 */
-	public $views = [
-		'login'		   => 'Myth\Auth\Views\login',
-		'register'		=> 'Myth\Auth\Views\register',
-		'forgot'		  => 'Myth\Auth\Views\forgot',
-		'reset'		   => 'Myth\Auth\Views\reset',
-		'emailForgot'	 => 'Myth\Auth\Views\emails\forgot',
-		'emailActivation' => 'Myth\Auth\Views\emails\activation',
-	];
+    /**
+     * --------------------------------------------------------------------
+     * Views used by Auth Controllers
+     * --------------------------------------------------------------------
+     *
+     * @var array
+     */
+    public $views = [
+        'login'		   => 'Myth\Auth\Views\login',
+        'register'		=> 'Myth\Auth\Views\register',
+        'forgot'		  => 'Myth\Auth\Views\forgot',
+        'reset'		   => 'Myth\Auth\Views\reset',
+        'emailForgot'	 => 'Myth\Auth\Views\emails\forgot',
+        'emailActivation' => 'Myth\Auth\Views\emails\activation',
+    ];
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Layout for the views to extend
-	 * --------------------------------------------------------------------
-	 *
-	 * @var string
-	 */
-	public $viewLayout = 'Myth\Auth\Views\layout';
+    /**
+     * --------------------------------------------------------------------
+     * Layout for the views to extend
+     * --------------------------------------------------------------------
+     *
+     * @var string
+     */
+    public $viewLayout = 'Myth\Auth\Views\layout';
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Authentication
-	 * --------------------------------------------------------------------
-	 *
-	 * Fields that are available to be used as credentials for login.
-	 *
-	 * @var string[]
-	 */
-	public $validFields = [
-		'email',
-		'username',
-	];
+    /**
+     * --------------------------------------------------------------------
+     * Authentication
+     * --------------------------------------------------------------------
+     *
+     * Fields that are available to be used as credentials for login.
+     *
+     * @var string[]
+     */
+    public $validFields = [
+        'email',
+        'username',
+    ];
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Additional Fields for "Nothing Personal"
-	 * --------------------------------------------------------------------
-	 *
-	 * The `NothingPersonalValidator` prevents personal information from
-	 * being used in passwords. The email and username fields are always
-	 * considered by the validator. Do not enter those field names here.
-	 *
-	 * An extend User Entity might include other personal info such as
-	 * first and/or last names. `$personalFields` is where you can add
-	 * fields to be considered as "personal" by the NothingPersonalValidator.
-	 *
-	 * For example:
-	 *	 $personalFields = ['firstname', 'lastname'];
-	 *
-	 * @var string[]
-	 */
-	public $personalFields = [];
+    /**
+     * --------------------------------------------------------------------
+     * Additional Fields for "Nothing Personal"
+     * --------------------------------------------------------------------
+     *
+     * The `NothingPersonalValidator` prevents personal information from
+     * being used in passwords. The email and username fields are always
+     * considered by the validator. Do not enter those field names here.
+     *
+     * An extend User Entity might include other personal info such as
+     * first and/or last names. `$personalFields` is where you can add
+     * fields to be considered as "personal" by the NothingPersonalValidator.
+     *
+     * For example:
+     *	 $personalFields = ['firstname', 'lastname'];
+     *
+     * @var string[]
+     */
+    public $personalFields = [];
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Password / Username Similarity
-	 * --------------------------------------------------------------------
-	 *
-	 * Among other things, the NothingPersonalValidator checks the
-	 * amount of sameness between the password and username.
-	 * Passwords that are too much like the username are invalid.
-	 *
-	 * The value set for $maxSimilarity represents the maximum percentage
-	 * of similarity at which the password will be accepted. In other words, any
-	 * calculated similarity equal to, or greater than $maxSimilarity
-	 * is rejected.
-	 *
-	 * The accepted range is 0-100, with 0 (zero) meaning don't check similarity.
-	 * Using values at either extreme of the *working range* (1-100) is
-	 * not advised. The low end is too restrictive and the high end is too permissive.
-	 * The suggested value for $maxSimilarity is 50.
-	 *
-	 * You may be thinking that a value of 100 should have the effect of accepting
-	 * everything like a value of 0 does. That's logical and probably true,
-	 * but is unproven and untested. Besides, 0 skips the work involved
-	 * making the calculation unlike when using 100.
-	 *
-	 * The (admittedly limited) testing that's been done suggests a useful working range
-	 * of 50 to 60. You can set it lower than 50, but site users will probably start
-	 * to complain about the large number of proposed passwords getting rejected.
-	 * At around 60 or more it starts to see pairs like 'captain joe' and 'joe*captain' as
-	 * perfectly acceptable which clearly they are not.
-	 *
-	 *
-	 * To disable similarity checking set the value to 0.
-	 *	  public $maxSimilarity = 0;
-	 *
-	 * @var int
-	 */
-	public $maxSimilarity = 50;
+    /**
+     * --------------------------------------------------------------------
+     * Password / Username Similarity
+     * --------------------------------------------------------------------
+     *
+     * Among other things, the NothingPersonalValidator checks the
+     * amount of sameness between the password and username.
+     * Passwords that are too much like the username are invalid.
+     *
+     * The value set for $maxSimilarity represents the maximum percentage
+     * of similarity at which the password will be accepted. In other words, any
+     * calculated similarity equal to, or greater than $maxSimilarity
+     * is rejected.
+     *
+     * The accepted range is 0-100, with 0 (zero) meaning don't check similarity.
+     * Using values at either extreme of the *working range* (1-100) is
+     * not advised. The low end is too restrictive and the high end is too permissive.
+     * The suggested value for $maxSimilarity is 50.
+     *
+     * You may be thinking that a value of 100 should have the effect of accepting
+     * everything like a value of 0 does. That's logical and probably true,
+     * but is unproven and untested. Besides, 0 skips the work involved
+     * making the calculation unlike when using 100.
+     *
+     * The (admittedly limited) testing that's been done suggests a useful working range
+     * of 50 to 60. You can set it lower than 50, but site users will probably start
+     * to complain about the large number of proposed passwords getting rejected.
+     * At around 60 or more it starts to see pairs like 'captain joe' and 'joe*captain' as
+     * perfectly acceptable which clearly they are not.
+     *
+     *
+     * To disable similarity checking set the value to 0.
+     *	  public $maxSimilarity = 0;
+     *
+     * @var int
+     */
+    public $maxSimilarity = 50;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Allow User Registration
-	 * --------------------------------------------------------------------
-	 *
-	 * When enabled (default) any unregistered user may apply for a new
-	 * account. If you disable registration you may need to ensure your
-	 * controllers and views know not to offer registration.
-	 *
-	 * @var bool
-	 */
-	public $allowRegistration = true;
+    /**
+     * --------------------------------------------------------------------
+     * Allow User Registration
+     * --------------------------------------------------------------------
+     *
+     * When enabled (default) any unregistered user may apply for a new
+     * account. If you disable registration you may need to ensure your
+     * controllers and views know not to offer registration.
+     *
+     * @var bool
+     */
+    public $allowRegistration = true;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Require Confirmation Registration via Email
-	 * --------------------------------------------------------------------
-	 *
-	 * When enabled, every registered user will receive an email message
-	 * with an activation link to confirm the account.
-	 *
-	 * @var string|null Name of the ActivatorInterface class
-	 */
-	public $requireActivation = 'Myth\Auth\Authentication\Activators\EmailActivator';
+    /**
+     * --------------------------------------------------------------------
+     * Require Confirmation Registration via Email
+     * --------------------------------------------------------------------
+     *
+     * When enabled, every registered user will receive an email message
+     * with an activation link to confirm the account.
+     *
+     * @var string|null Name of the ActivatorInterface class
+     */
+    public $requireActivation = 'Myth\Auth\Authentication\Activators\EmailActivator';
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Allow Password Reset via Email
-	 * --------------------------------------------------------------------
-	 *
-	 * When enabled, users will have the option to reset their password
-	 * via the specified Resetter. Default setting is email.
-	 *
-	 * @var string|null Name of the ResetterInterface class
-	 */
-	public $activeResetter = 'Myth\Auth\Authentication\Resetters\EmailResetter';
+    /**
+     * --------------------------------------------------------------------
+     * Allow Password Reset via Email
+     * --------------------------------------------------------------------
+     *
+     * When enabled, users will have the option to reset their password
+     * via the specified Resetter. Default setting is email.
+     *
+     * @var string|null Name of the ResetterInterface class
+     */
+    public $activeResetter = 'Myth\Auth\Authentication\Resetters\EmailResetter';
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Allow Persistent Login Cookies (Remember me)
-	 * --------------------------------------------------------------------
-	 *
-	 * While every attempt has been made to create a very strong protection
-	 * with the remember me system, there are some cases (like when you
-	 * need extreme protection, like dealing with users financials) that
-	 * you might not want the extra risk associated with this cookie-based
-	 * solution.
-	 *
-	 * @var bool
-	 */
-	public $allowRemembering = true;
+    /**
+     * --------------------------------------------------------------------
+     * Allow Persistent Login Cookies (Remember me)
+     * --------------------------------------------------------------------
+     *
+     * While every attempt has been made to create a very strong protection
+     * with the remember me system, there are some cases (like when you
+     * need extreme protection, like dealing with users financials) that
+     * you might not want the extra risk associated with this cookie-based
+     * solution.
+     *
+     * @var bool
+     */
+    public $allowRemembering = true;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Remember Length
-	 * --------------------------------------------------------------------
-	 *
-	 * The amount of time, in seconds, that you want a login to last for.
-	 * Defaults to 30 days.
-	 *
-	 * @var int
-	 */
-	public $rememberLength = 30 * DAY;
+    /**
+     * --------------------------------------------------------------------
+     * Remember Length
+     * --------------------------------------------------------------------
+     *
+     * The amount of time, in seconds, that you want a login to last for.
+     * Defaults to 30 days.
+     *
+     * @var int
+     */
+    public $rememberLength = 30 * DAY;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Error handling
-	 * --------------------------------------------------------------------
-	 *
-	 * If true, will continue instead of throwing exceptions.
-	 *
-	 * @var bool
-	 */
-	public $silent = false;
+    /**
+     * --------------------------------------------------------------------
+     * Error handling
+     * --------------------------------------------------------------------
+     *
+     * If true, will continue instead of throwing exceptions.
+     *
+     * @var bool
+     */
+    public $silent = false;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Encryption Algorithm to Use
-	 * --------------------------------------------------------------------
-	 *
-	 * Valid values are
-	 * - PASSWORD_DEFAULT (default)
-	 * - PASSWORD_BCRYPT
-	 * - PASSWORD_ARGON2I  - As of PHP 7.2 only if compiled with support for it
-	 * - PASSWORD_ARGON2ID - As of PHP 7.3 only if compiled with support for it
-	 *
-	 * If you choose to use any ARGON algorithm, then you might want to
-	 * uncomment the "ARGON2i/D Algorithm" options to suit your needs
-	 *
-	 * @var string|int
-	 */
-	public $hashAlgorithm = PASSWORD_DEFAULT;
+    /**
+     * --------------------------------------------------------------------
+     * Encryption Algorithm to Use
+     * --------------------------------------------------------------------
+     *
+     * Valid values are
+     * - PASSWORD_DEFAULT (default)
+     * - PASSWORD_BCRYPT
+     * - PASSWORD_ARGON2I  - As of PHP 7.2 only if compiled with support for it
+     * - PASSWORD_ARGON2ID - As of PHP 7.3 only if compiled with support for it
+     *
+     * If you choose to use any ARGON algorithm, then you might want to
+     * uncomment the "ARGON2i/D Algorithm" options to suit your needs
+     *
+     * @var string|int
+     */
+    public $hashAlgorithm = PASSWORD_DEFAULT;
 
-	/*
+    /*
 	 * --------------------------------------------------------------------
 	 * ARGON2i/D Algorithm options
 	 * --------------------------------------------------------------------
@@ -232,106 +232,106 @@ 
 	 * cost. This makes the hashing process takes longer.
 	 */
 
-	/** @var int */
-	public $hashMemoryCost = 2048; // PASSWORD_ARGON2_DEFAULT_MEMORY_COST;
+    /** @var int */
+    public $hashMemoryCost = 2048; // PASSWORD_ARGON2_DEFAULT_MEMORY_COST;
 
-	/** @var int */
-	public $hashTimeCost = 4; // PASSWORD_ARGON2_DEFAULT_TIME_COST;
+    /** @var int */
+    public $hashTimeCost = 4; // PASSWORD_ARGON2_DEFAULT_TIME_COST;
 
-	/** @var int */
-	public $hashThreads = 4; // PASSWORD_ARGON2_DEFAULT_THREADS;
+    /** @var int */
+    public $hashThreads = 4; // PASSWORD_ARGON2_DEFAULT_THREADS;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Password Hashing Cost
-	 * --------------------------------------------------------------------
-	 *
-	 * The BCRYPT method of encryption allows you to define the "cost"
-	 * or number of iterations made, whenever a password hash is created.
-	 * This defaults to a value of 10 which is an acceptable number.
-	 * However, depending on the security needs of your application
-	 * and the power of your hardware, you might want to increase the
-	 * cost. This makes the hashing process takes longer.
-	 *
-	 * Valid range is between 4 - 31.
-	 *
-	 * @var int
-	 */
-	public $hashCost = 10;
+    /**
+     * --------------------------------------------------------------------
+     * Password Hashing Cost
+     * --------------------------------------------------------------------
+     *
+     * The BCRYPT method of encryption allows you to define the "cost"
+     * or number of iterations made, whenever a password hash is created.
+     * This defaults to a value of 10 which is an acceptable number.
+     * However, depending on the security needs of your application
+     * and the power of your hardware, you might want to increase the
+     * cost. This makes the hashing process takes longer.
+     *
+     * Valid range is between 4 - 31.
+     *
+     * @var int
+     */
+    public $hashCost = 10;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Minimum Password Length
-	 * --------------------------------------------------------------------
-	 *
-	 * The minimum length that a password must be to be accepted.
-	 * Recommended minimum value by NIST = 8 characters.
-	 *
-	 * @var int
-	 */
-	public $minimumPasswordLength = 8;
+    /**
+     * --------------------------------------------------------------------
+     * Minimum Password Length
+     * --------------------------------------------------------------------
+     *
+     * The minimum length that a password must be to be accepted.
+     * Recommended minimum value by NIST = 8 characters.
+     *
+     * @var int
+     */
+    public $minimumPasswordLength = 8;
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Password Check Helpers
-	 * --------------------------------------------------------------------
-	 *
-	 * The PasswordValidater class runs the password through all of these
-	 * classes, each getting the opportunity to pass/fail the password.
-	 *
-	 * You can add custom classes as long as they adhere to the
-	 * Password\ValidatorInterface.
-	 *
-	 * @var string[]
-	 */
-	public $passwordValidators = [
-		'Myth\Auth\Authentication\Passwords\CompositionValidator',
-		'Myth\Auth\Authentication\Passwords\NothingPersonalValidator',
-		'Myth\Auth\Authentication\Passwords\DictionaryValidator',
-		// 'Myth\Auth\Authentication\Passwords\PwnedValidator',
-	];
+    /**
+     * --------------------------------------------------------------------
+     * Password Check Helpers
+     * --------------------------------------------------------------------
+     *
+     * The PasswordValidater class runs the password through all of these
+     * classes, each getting the opportunity to pass/fail the password.
+     *
+     * You can add custom classes as long as they adhere to the
+     * Password\ValidatorInterface.
+     *
+     * @var string[]
+     */
+    public $passwordValidators = [
+        'Myth\Auth\Authentication\Passwords\CompositionValidator',
+        'Myth\Auth\Authentication\Passwords\NothingPersonalValidator',
+        'Myth\Auth\Authentication\Passwords\DictionaryValidator',
+        // 'Myth\Auth\Authentication\Passwords\PwnedValidator',
+    ];
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Activator classes
-	 * --------------------------------------------------------------------
-	 *
-	 * Available activators with config settings
-	 *
-	 * @var array
-	 */
-	public $userActivators = [
-		'Myth\Auth\Authentication\Activators\EmailActivator' => [
-			'fromEmail' => null,
-			'fromName' => null,
-		],
-	];
+    /**
+     * --------------------------------------------------------------------
+     * Activator classes
+     * --------------------------------------------------------------------
+     *
+     * Available activators with config settings
+     *
+     * @var array
+     */
+    public $userActivators = [
+        'Myth\Auth\Authentication\Activators\EmailActivator' => [
+            'fromEmail' => null,
+            'fromName' => null,
+        ],
+    ];
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Resetter Classes
-	 * --------------------------------------------------------------------
-	 *
-	 * Available resetters with config settings
-	 *
-	 * @var array
-	 */
-	public $userResetters = [
-		'Myth\Auth\Authentication\Resetters\EmailResetter' => [
-			'fromEmail' => null,
-			'fromName' => null,
-		],
-	];
+    /**
+     * --------------------------------------------------------------------
+     * Resetter Classes
+     * --------------------------------------------------------------------
+     *
+     * Available resetters with config settings
+     *
+     * @var array
+     */
+    public $userResetters = [
+        'Myth\Auth\Authentication\Resetters\EmailResetter' => [
+            'fromEmail' => null,
+            'fromName' => null,
+        ],
+    ];
 
-	/**
-	 * --------------------------------------------------------------------
-	 * Reset Time
-	 * --------------------------------------------------------------------
-	 *
-	 * The amount of time that a password reset-token is valid for,
-	 * in seconds.
-	 *
-	 * @var int
-	 */
-	public $resetTime = 3600;
+    /**
+     * --------------------------------------------------------------------
+     * Reset Time
+     * --------------------------------------------------------------------
+     *
+     * The amount of time that a password reset-token is valid for,
+     * in seconds.
+     *
+     * @var int
+     */
+    public $resetTime = 3600;
 }

brighty/vendor/myth/auth/src/Filters/LoginFilter.php

Indentation +47 added lines, -47 removed lines

@@ -7,56 +7,56 @@
 
 class LoginFilter implements FilterInterface
 {
-	/**
-	 * Verifies that a user is logged in, or redirects to login.
-	 *
-	 * @param RequestInterface $request
-	 * @param array|null $params
-	 *
-	 * @return mixed
-	 */
-	public function before(RequestInterface $request, $params = null)
-	{
-		if (! function_exists('logged_in'))
-		{
-			helper('auth');
-		}
+    /**
+     * Verifies that a user is logged in, or redirects to login.
+     *
+     * @param RequestInterface $request
+     * @param array|null $params
+     *
+     * @return mixed
+     */
+    public function before(RequestInterface $request, $params = null)
+    {
+        if (! function_exists('logged_in'))
+        {
+            helper('auth');
+        }
 
-		$current = (string)current_url(true)
-			->setHost('')
-			->setScheme('')
-			->stripQuery('token');
+        $current = (string)current_url(true)
+            ->setHost('')
+            ->setScheme('')
+            ->stripQuery('token');
 
-		$config = config(App::class);
-		if($config->forceGlobalSecureRequests)
-		{
-			# Remove "https:/"
-			$current = substr($current, 7);
-		}
+        $config = config(App::class);
+        if($config->forceGlobalSecureRequests)
+        {
+            # Remove "https:/"
+            $current = substr($current, 7);
+        }
 
-		// Make sure this isn't already a login route
-		if (in_array((string)$current, [route_to('login'), route_to('forgot'), route_to('reset-password'), route_to('register'), route_to('activate-account')]))
-		{
-			return;
-		}
+        // Make sure this isn't already a login route
+        if (in_array((string)$current, [route_to('login'), route_to('forgot'), route_to('reset-password'), route_to('register'), route_to('activate-account')]))
+        {
+            return;
+        }
 
-		// if no user is logged in then send to the login form
-		$authenticate = service('authentication');
-		if (! $authenticate->check())
-		{
-			session()->set('redirect_url', current_url());
-			return redirect('login');
-		}
-	}
+        // if no user is logged in then send to the login form
+        $authenticate = service('authentication');
+        if (! $authenticate->check())
+        {
+            session()->set('redirect_url', current_url());
+            return redirect('login');
+        }
+    }
 
-	/**
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param array|null $arguments
-	 *
-	 * @return void
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
+    /**
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     * @param array|null $arguments
+     *
+     * @return void
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }

brighty/vendor/myth/auth/src/Filters/RoleFilter.php

Indentation +68 added lines, -68 removed lines

@@ -7,82 +7,82 @@
 
 class RoleFilter implements FilterInterface
 {
-	/**
-	 * Do whatever processing this filter needs to do.
-	 * By default it should not return anything during
-	 * normal execution. However, when an abnormal state
-	 * is found, it should return an instance of
-	 * CodeIgniter\HTTP\Response. If it does, script
-	 * execution will end and that Response will be
-	 * sent back to the client, allowing for error pages,
-	 * redirects, etc.
-	 *
-	 * @param RequestInterface $request
-	 * @param array|null                         $params
-	 *
-	 * @return mixed
-	 */
-	public function before(RequestInterface $request, $params = null)
-	{
-		if (! function_exists('logged_in'))
-		{
-			helper('auth');
-		}
+    /**
+     * Do whatever processing this filter needs to do.
+     * By default it should not return anything during
+     * normal execution. However, when an abnormal state
+     * is found, it should return an instance of
+     * CodeIgniter\HTTP\Response. If it does, script
+     * execution will end and that Response will be
+     * sent back to the client, allowing for error pages,
+     * redirects, etc.
+     *
+     * @param RequestInterface $request
+     * @param array|null                         $params
+     *
+     * @return mixed
+     */
+    public function before(RequestInterface $request, $params = null)
+    {
+        if (! function_exists('logged_in'))
+        {
+            helper('auth');
+        }
 
-		if (empty($params))
-		{
-			return;
-		}
+        if (empty($params))
+        {
+            return;
+        }
 
-		$authenticate = service('authentication');
+        $authenticate = service('authentication');
 
-		// if no user is logged in then send to the login form
-		if (! $authenticate->check())
-		{
-			session()->set('redirect_url', current_url());
-			return redirect('login');
-		}
+        // if no user is logged in then send to the login form
+        if (! $authenticate->check())
+        {
+            session()->set('redirect_url', current_url());
+            return redirect('login');
+        }
 
-		$authorize = service('authorization');
+        $authorize = service('authorization');
 
-		// Check each requested permission
-		foreach ($params as $group)
-		{
-			if($authorize->inGroup($group, $authenticate->id()))
-			{
-				return;
-			}
-		}
+        // Check each requested permission
+        foreach ($params as $group)
+        {
+            if($authorize->inGroup($group, $authenticate->id()))
+            {
+                return;
+            }
+        }
 
-		if ($authenticate->silent())
-		{
-			$redirectURL = session('redirect_url') ?? '/';
-			unset($_SESSION['redirect_url']);
-			return redirect()->to($redirectURL)->with('error', lang('Auth.notEnoughPrivilege'));
-		}
-		else {
-			throw new PermissionException(lang('Auth.notEnoughPrivilege'));
-		}
-	}
+        if ($authenticate->silent())
+        {
+            $redirectURL = session('redirect_url') ?? '/';
+            unset($_SESSION['redirect_url']);
+            return redirect()->to($redirectURL)->with('error', lang('Auth.notEnoughPrivilege'));
+        }
+        else {
+            throw new PermissionException(lang('Auth.notEnoughPrivilege'));
+        }
+    }
 
-	//--------------------------------------------------------------------
+    //--------------------------------------------------------------------
 
-	/**
-	 * Allows After filters to inspect and modify the response
-	 * object as needed. This method does not allow any way
-	 * to stop execution of other after filters, short of
-	 * throwing an Exception or Error.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param array|null                          $arguments
-	 *
-	 * @return void
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
+    /**
+     * Allows After filters to inspect and modify the response
+     * object as needed. This method does not allow any way
+     * to stop execution of other after filters, short of
+     * throwing an Exception or Error.
+     *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     * @param array|null                          $arguments
+     *
+     * @return void
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
 
-	}
+    }
 
-	//--------------------------------------------------------------------
+    //--------------------------------------------------------------------
 }

brighty/vendor/myth/auth/src/Filters/PermissionFilter.php

Indentation +69 added lines, -69 removed lines

@@ -7,83 +7,83 @@
 
 class PermissionFilter implements FilterInterface
 {
-	/**
-	 * Do whatever processing this filter needs to do.
-	 * By default it should not return anything during
-	 * normal execution. However, when an abnormal state
-	 * is found, it should return an instance of
-	 * CodeIgniter\HTTP\Response. If it does, script
-	 * execution will end and that Response will be
-	 * sent back to the client, allowing for error pages,
-	 * redirects, etc.
-	 *
-	 * @param RequestInterface $request
-	 * @param array|null                         $params
-	 *
-	 * @return mixed
-	 */
-	public function before(RequestInterface $request, $params = null)
-	{
-		if (! function_exists('logged_in'))
-		{
-			helper('auth');
-		}
+    /**
+     * Do whatever processing this filter needs to do.
+     * By default it should not return anything during
+     * normal execution. However, when an abnormal state
+     * is found, it should return an instance of
+     * CodeIgniter\HTTP\Response. If it does, script
+     * execution will end and that Response will be
+     * sent back to the client, allowing for error pages,
+     * redirects, etc.
+     *
+     * @param RequestInterface $request
+     * @param array|null                         $params
+     *
+     * @return mixed
+     */
+    public function before(RequestInterface $request, $params = null)
+    {
+        if (! function_exists('logged_in'))
+        {
+            helper('auth');
+        }
 
-		if (empty($params))
-		{
-			return;
-		}
+        if (empty($params))
+        {
+            return;
+        }
 
-		$authenticate = service('authentication');
+        $authenticate = service('authentication');
 
-		// if no user is logged in then send to the login form
-		if (! $authenticate->check())
-		{
-			session()->set('redirect_url', current_url());
-			return redirect('login');
-		}
+        // if no user is logged in then send to the login form
+        if (! $authenticate->check())
+        {
+            session()->set('redirect_url', current_url());
+            return redirect('login');
+        }
 
-		$authorize = service('authorization');
-		$result = true;
+        $authorize = service('authorization');
+        $result = true;
 
-		// Check each requested permission
-		foreach ($params as $permission)
-		{
-			$result = $result && $authorize->hasPermission($permission, $authenticate->id());
-		}
+        // Check each requested permission
+        foreach ($params as $permission)
+        {
+            $result = $result && $authorize->hasPermission($permission, $authenticate->id());
+        }
 
-		if (! $result)
-		{
-			if ($authenticate->silent())
-			{
-				$redirectURL = session('redirect_url') ?? '/';
-				unset($_SESSION['redirect_url']);
-				return redirect()->to($redirectURL)->with('error', lang('Auth.notEnoughPrivilege'));
-			}
-			else {
-				throw new PermissionException(lang('Auth.notEnoughPrivilege'));
-			}
-		}
-	}
+        if (! $result)
+        {
+            if ($authenticate->silent())
+            {
+                $redirectURL = session('redirect_url') ?? '/';
+                unset($_SESSION['redirect_url']);
+                return redirect()->to($redirectURL)->with('error', lang('Auth.notEnoughPrivilege'));
+            }
+            else {
+                throw new PermissionException(lang('Auth.notEnoughPrivilege'));
+            }
+        }
+    }
 
-	//--------------------------------------------------------------------
+    //--------------------------------------------------------------------
 
-	/**
-	 * Allows After filters to inspect and modify the response
-	 * object as needed. This method does not allow any way
-	 * to stop execution of other after filters, short of
-	 * throwing an Exception or Error.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param array|null                          $arguments
-	 *
-	 * @return void
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
+    /**
+     * Allows After filters to inspect and modify the response
+     * object as needed. This method does not allow any way
+     * to stop execution of other after filters, short of
+     * throwing an Exception or Error.
+     *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     * @param array|null                          $arguments
+     *
+     * @return void
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
 
-	}
+    }
 
-	//--------------------------------------------------------------------
+    //--------------------------------------------------------------------
 }

brighty/vendor/myth/auth/src/Authentication/Resetters/BaseResetter.php

Indentation +55 added lines, -55 removed lines

@@ -5,66 +5,66 @@
 
 abstract class BaseResetter
 {
-	/**
-	 * @var AuthConfig
-	 */
-	protected $config;
+    /**
+     * @var AuthConfig
+     */
+    protected $config;
 
-	/**
-	 * @var string
-	 */
-	protected $error = '';
+    /**
+     * @var string
+     */
+    protected $error = '';
 
-	/**
-	 * Sends a reset message to user
-	 *
-	 * @param User $user
-	 *
-	 * @return bool
-	 */
-	abstract public function send(User $user = null): bool;
+    /**
+     * Sends a reset message to user
+     *
+     * @param User $user
+     *
+     * @return bool
+     */
+    abstract public function send(User $user = null): bool;
 
-	/**
-	 * Sets the initial config file.
-	 *
-	 * @param AuthConfig|null $config
-	 */
-	public function __construct(AuthConfig $config = null)
-	{
-		$this->config = $config ?? config('Auth');
-	}
+    /**
+     * Sets the initial config file.
+     *
+     * @param AuthConfig|null $config
+     */
+    public function __construct(AuthConfig $config = null)
+    {
+        $this->config = $config ?? config('Auth');
+    }
 
-	/**
-	 * Allows for changing the config file on the Resetter.
-	 *
-	 * @param AuthConfig $config
-	 *
-	 * @return $this
-	 */
-	public function setConfig(AuthConfig $config)
-	{
-		$this->config = $config;
+    /**
+     * Allows for changing the config file on the Resetter.
+     *
+     * @param AuthConfig $config
+     *
+     * @return $this
+     */
+    public function setConfig(AuthConfig $config)
+    {
+        $this->config = $config;
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Gets a config settings for current Resetter.
-	 *
-	 * @return object
-	 */
-	public function getResetterSettings()
-	{
-		return (object) $this->config->userResetters[static::class];
-	}
+    /**
+     * Gets a config settings for current Resetter.
+     *
+     * @return object
+     */
+    public function getResetterSettings()
+    {
+        return (object) $this->config->userResetters[static::class];
+    }
 
-	/**
-	 * Returns the current error.
-	 *
-	 * @return string
-	 */
-	public function error(): string
-	{
-		return $this->error;
-	}
+    /**
+     * Returns the current error.
+     *
+     * @return string
+     */
+    public function error(): string
+    {
+        return $this->error;
+    }
 }

brighty/vendor/myth/auth/src/Authentication/Resetters/EmailResetter.php

Indentation +5 added lines, -5 removed lines

@@ -27,11 +27,11 @@
         $settings = $this->getResetterSettings();
 
         $sent = $email->setFrom($settings->fromEmail ?? $config->fromEmail, $settings->fromName ?? $config->fromName)
-              ->setTo($user->email)
-              ->setSubject(lang('Auth.forgotSubject'))
-              ->setMessage(view($this->config->views['emailForgot'], ['hash' => $user->reset_hash]))
-              ->setMailType('html')
-              ->send();
+                ->setTo($user->email)
+                ->setSubject(lang('Auth.forgotSubject'))
+                ->setMessage(view($this->config->views['emailForgot'], ['hash' => $user->reset_hash]))
+                ->setMailType('html')
+                ->send();
 
         if (! $sent)
         {