Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename UserAccountInterface to UserEntityInterface. #3500

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Rename UserAccountInterface to UserEntityInterface. #3500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
879c223
Rename UserAccountInterface tO UserEntityInterface.
demiankatz Mar 12, 2024
05e9bce
Fix typo.
demiankatz Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions module/VuFind/src/VuFind/Auth/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
use Laminas\Session\SessionManager;
use LmcRbacMvc\Identity\IdentityInterface;
use VuFind\Cookie\CookieManager;
use VuFind\Db\Interface\UserAccountInterface;
use VuFind\Db\Entity\UserEntityInterface;
use VuFind\Db\Row\User as UserRow;
use VuFind\Db\Table\User as UserTable;
use VuFind\Exception\Auth as AuthException;
Expand Down Expand Up @@ -132,7 +132,7 @@ class Manager implements
/**
* Cache for current logged in user object
*
* @var ?UserAccountInterface
* @var ?UserEntityInterface
*/
protected $currentUser = null;

Expand Down Expand Up @@ -594,9 +594,9 @@ public function isLoggedIn()
/**
* Checks whether the user is logged in.
*
* @return ?UserAccountInterface Object if user is logged in, null otherwise.
* @return ?UserEntityInterface Object if user is logged in, null otherwise.
*/
public function getUserObject(): ?UserAccountInterface
public function getUserObject(): ?UserEntityInterface
{
// If user object is not in cache, but user ID is in session,
// load the object from the database:
Expand Down
4 changes: 2 additions & 2 deletions ...ind/Db/Interface/UserAccountInterface.php → .../VuFind/Db/Entity/UserEntityInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @link https://vufind.org Main Site
*/

namespace VuFind\Db\Interface;
namespace VuFind\Db\Entity;

/**
* Interface for representing a user account record.
Expand All @@ -38,6 +38,6 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org Main Site
*/
interface UserAccountInterface
interface UserEntityInterface
{
}
2 changes: 1 addition & 1 deletion module/VuFind/src/VuFind/Db/Row/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* @property string $last_language
*/
class User extends RowGateway implements
\VuFind\Db\Interface\UserAccountInterface,
\VuFind\Db\Entity\UserEntityInterface,
\VuFind\Db\Table\DbTableAwareInterface,
\LmcRbacMvc\Identity\IdentityInterface
{
Expand Down
6 changes: 3 additions & 3 deletions module/VuFind/src/VuFind/View/Helper/Root/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
namespace VuFind\View\Helper\Root;

use LmcRbacMvc\Identity\IdentityInterface;
use VuFind\Db\Interface\UserAccountInterface;
use VuFind\Db\Entity\UserEntityInterface;
use VuFind\Exception\ILS as ILSException;

/**
Expand Down Expand Up @@ -117,9 +117,9 @@ public function isLoggedIn()
/**
* Checks whether the user is logged in.
*
* @return ?UserAccountInterface Object if user is logged in, null otherwise.
* @return ?UserEntityInterface Object if user is logged in, null otherwise.
*/
public function getUserObject(): ?UserAccountInterface
public function getUserObject(): ?UserEntityInterface
{
return $this->getManager()->getUserObject();
}
Expand Down