use fully qualified class names (#22833: Short-term admin accounts)

Author: lfolco

app/code/Magento/Security/Api/Data/UserExpirationInterface.php

@@ -8,6 +8,8 @@
 
 namespace Magento\Security\Api\Data;
 
+use \Magento\Security\Api\Data\UserExpirationExtensionInterface;
+
 /**
  * Interface UserExpirationInterface to be used as a DTO for expires_at property on User model.
  */
@@ -51,15 +53,15 @@ public function setUserId($userId);
     /**
      * Retrieve existing extension attributes object or create a new one.
      *
-     * @return \Magento\Security\Api\Data\UserExpirationExtensionInterface|null
+     * @return UserExpirationExtensionInterface|null
      */
     public function getExtensionAttributes();
 
     /**
      * Set an extension attributes object.
      *
-     * @param \Magento\Security\Api\Data\UserExpirationExtensionInterface $extensionAttributes
+     * @param UserExpirationExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(\Magento\Security\Api\Data\UserExpirationExtensionInterface $extensionAttributes);
+    public function setExtensionAttributes(UserExpirationExtensionInterface $extensionAttributes);
 }

app/code/Magento/Security/Model/Plugin/AdminUserForm.php

@@ -7,38 +7,42 @@
 
 namespace Magento\Security\Model\Plugin;
 
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Security\Model\ResourceModel\UserExpiration;
+use Magento\Security\Model\UserExpirationFactory;
+
 /**
  * Add the `expires_at` form field to the User main form.
  */
 class AdminUserForm
 {
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @var TimezoneInterface
      */
     private $localeDate;
 
     /**
-     * @var \Magento\Security\Model\ResourceModel\UserExpiration
+     * @var UserExpiration
      */
     private $userExpirationResource;
 
     /**
-     * @var \Magento\Security\Api\Data\UserExpirationInterfaceFactory
+     * @var UserExpirationFactory
      */
     private $userExpirationFactory;
 
     /**
      * UserForm constructor.
      *
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Security\Model\UserExpirationFactory $userExpirationFactory
-     * @param \Magento\Security\Model\ResourceModel\UserExpiration $userExpirationResource
+     * @param TimezoneInterface $localeDate
+     * @param UserExpirationFactory $userExpirationFactory
+     * @param UserExpiration $userExpirationResource
      */
     public function __construct(
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\Security\Model\UserExpirationFactory $userExpirationFactory,
-        \Magento\Security\Model\ResourceModel\UserExpiration $userExpirationResource
+        TimezoneInterface $localeDate,
+        UserExpirationFactory $userExpirationFactory,
+        UserExpiration $userExpirationResource
     ) {
         $this->localeDate = $localeDate;
         $this->userExpirationResource = $userExpirationResource;

app/code/Magento/Security/Model/Plugin/UserValidationRules.php

@@ -7,20 +7,22 @@
 
 namespace Magento\Security\Model\Plugin;
 
+use Magento\Security\Model\UserExpiration\Validator;
+
 /**
  * \Magento\User\Model\UserValidationRules decorator
  */
 class UserValidationRules
 {
-    /**@var \Magento\Security\Model\UserExpiration\Validator */
+    /**@var Validator */
     private $validator;
 
     /**
      * UserValidationRules constructor.
      *
-     * @param \Magento\Security\Model\UserExpiration\Validator $validator
+     * @param Validator $validator
      */
-    public function __construct(\Magento\Security\Model\UserExpiration\Validator $validator)
+    public function __construct(Validator $validator)
     {
         $this->validator = $validator;
     }

app/code/Magento/Security/Model/UserExpiration.php

@@ -7,12 +7,14 @@
 
 namespace Magento\Security\Model;
 
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Security\Api\Data\UserExpirationExtensionInterface;
 use Magento\Security\Api\Data\UserExpirationInterface;
 
 /**
  * Admin User Expiration model.
  */
-class UserExpiration extends \Magento\Framework\Model\AbstractExtensibleModel implements UserExpirationInterface
+class UserExpiration extends AbstractExtensibleModel implements UserExpirationInterface
 {
 
     /**
@@ -78,7 +80,7 @@ public function getExtensionAttributes()
     /**
      * @inheritDoc
      */
-    public function setExtensionAttributes(\Magento\Security\Api\Data\UserExpirationExtensionInterface $extensionAttributes)
+    public function setExtensionAttributes(UserExpirationExtensionInterface $extensionAttributes)
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }

app/code/Magento/Security/Model/UserExpiration/Validator.php

@@ -7,6 +7,8 @@
 
 namespace Magento\Security\Model\UserExpiration;
 
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\Validator\AbstractValidator;
 
 /**
@@ -15,21 +17,21 @@
 class Validator extends AbstractValidator
 {
 
-    /**@var \Magento\Framework\Stdlib\DateTime\TimezoneInterface */
+    /**@var TimezoneInterface */
     private $timezone;
 
-    /**@var \Magento\Framework\Stdlib\DateTime\DateTime */
+    /**@var DateTime */
     private $dateTime;
 
     /**
      * Validator constructor.
      *
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param TimezoneInterface $timezone
+     * @param DateTime $dateTime
      */
     public function __construct(
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone,
-        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+        TimezoneInterface $timezone,
+        DateTime $dateTime
     ) {
         $this->timezone = $timezone;
         $this->dateTime = $dateTime;

app/code/Magento/Security/Model/UserExpirationManager.php

@@ -7,7 +7,12 @@
 
 namespace Magento\Security\Model;
 
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory as AdminSessionCollectionFactory;
 use Magento\Security\Model\ResourceModel\UserExpiration\Collection as ExpiredUsersCollection;
+use Magento\Security\Model\ResourceModel\UserExpiration\CollectionFactory as UserExpirationCollectionFactory;
+use Magento\User\Model\ResourceModel\User\CollectionFactory as UserCollectionFactory;
 
 /**
  * Class to handle admin user expirations. Temporary admin users can be created with an expiration
@@ -19,7 +24,7 @@ class UserExpirationManager
 {
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var DateTime
      */
     private $dateTime;
 
@@ -34,7 +39,7 @@ class UserExpirationManager
     private $adminSessionInfoCollectionFactory;
 
     /**
-     * @var \Magento\Backend\Model\Auth\Session
+     * @var Session
      */
     private $authSession;
 
@@ -44,27 +49,27 @@ class UserExpirationManager
     private $userExpirationCollectionFactory;
 
     /**
-     * @var \Magento\User\Model\ResourceModel\User\CollectionFactory
+     * @var UserCollectionFactory
      */
     private $userCollectionFactory;
 
     /**
      * UserExpirationManager constructor.
      *
-     * @param \Magento\Backend\Model\Auth\Session $authSession
+     * @param Session $authSession
      * @param ConfigInterface $securityConfig
-     * @param ResourceModel\AdminSessionInfo\CollectionFactory $adminSessionInfoCollectionFactory
-     * @param ResourceModel\UserExpiration\CollectionFactory $userExpirationCollectionFactory
-     * @param \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param AdminSessionCollectionFactory $adminSessionInfoCollectionFactory
+     * @param UserExpirationCollectionFactory $userExpirationCollectionFactory
+     * @param UserCollectionFactory $userCollectionFactory
+     * @param DateTime $dateTime
      */
     public function __construct(
-        \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Security\Model\ConfigInterface $securityConfig,
-        \Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory $adminSessionInfoCollectionFactory,
-        \Magento\Security\Model\ResourceModel\UserExpiration\CollectionFactory $userExpirationCollectionFactory,
-        \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory,
-        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+        Session $authSession,
+        ConfigInterface $securityConfig,
+        AdminSessionCollectionFactory $adminSessionInfoCollectionFactory,
+        UserExpirationCollectionFactory $userExpirationCollectionFactory,
+        UserCollectionFactory $userCollectionFactory,
+        DateTime $dateTime
     ) {
         $this->dateTime = $dateTime;
         $this->securityConfig = $securityConfig;

app/code/Magento/Security/Observer/AdminUserAuthenticateBefore.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\Plugin\AuthenticationException;
 use Magento\Security\Model\UserExpirationManager;
+use Magento\User\Model\UserFactory;
 
 /**
  * Check for expired users.
@@ -23,19 +24,19 @@ class AdminUserAuthenticateBefore implements ObserverInterface
     private $userExpirationManager;
 
     /**
-     * @var \Magento\User\Model\UserFactory
+     * @var UserFactory
      */
     private $userFactory;
 
     /**
      * AdminUserAuthenticateBefore constructor.
      *
      * @param UserExpirationManager $userExpirationManager
-     * @param \Magento\User\Model\UserFactory $userFactory
+     * @param UserFactory $userFactory
      */
     public function __construct(
-        \Magento\Security\Model\UserExpirationManager $userExpirationManager,
-        \Magento\User\Model\UserFactory $userFactory
+        UserExpirationManager $userExpirationManager,
+        UserFactory $userFactory
     ) {
         $this->userExpirationManager = $userExpirationManager;
         $this->userFactory = $userFactory;

app/code/Magento/Security/Observer/AfterAdminUserSave.php

@@ -9,31 +9,33 @@
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Security\Model\ResourceModel\UserExpiration as UserExpirationResource;
+use Magento\Security\Model\UserExpirationFactory;
 
 /**
  * Save UserExpiration on admin user record.
  */
 class AfterAdminUserSave implements ObserverInterface
 {
     /**
-     * @var \Magento\Security\Model\UserExpirationFactory
+     * @var UserExpirationFactory
      */
     private $userExpirationFactory;
 
     /**
-     * @var \Magento\Security\Model\ResourceModel\UserExpiration
+     * @var UserExpirationResource
      */
     private $userExpirationResource;
 
     /**
      * AfterAdminUserSave constructor.
      *
-     * @param \Magento\Security\Model\UserExpirationFactory $userExpirationFactory
-     * @param \Magento\Security\Model\ResourceModel\UserExpiration $userExpirationResource
+     * @param UserExpirationFactory $userExpirationFactory
+     * @param UserExpirationResource $userExpirationResource
      */
     public function __construct(
-        \Magento\Security\Model\UserExpirationFactory $userExpirationFactory,
-        \Magento\Security\Model\ResourceModel\UserExpiration $userExpirationResource
+        UserExpirationFactory $userExpirationFactory,
+        UserExpirationResource $userExpirationResource
     ) {
 
         $this->userExpirationFactory = $userExpirationFactory;
@@ -45,6 +47,7 @@ public function __construct(
      *
      * @param Observer $observer
      * @return void
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     public function execute(Observer $observer)
     {