Merge pull request #5614 from magento-trigger/MC-33070

[TR] MC-33070: Make Integration tests compatible with PHPUnit9

Author: xmav

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -993,7 +993,7 @@ public function load($object, $entityId, $attributes = [])
         $select = $this->_getLoadRowSelect($object, $entityId);
         $row = $this->getConnection()->fetchRow($select);
 
-        if (is_array($row)) {
+        if (is_array($row) && !empty($row)) {
             $object->addData($row);
             $this->loadAttributesForObject($attributes, $object);
 

app/code/Magento/User/Model/User.php

@@ -8,6 +8,7 @@
 
 use Magento\Backend\Model\Auth\Credential\StorageInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -38,27 +39,27 @@
 class User extends AbstractModel implements StorageInterface, UserInterface
 {
     /**
-     * @deprecated
+     * @deprecated New functionality has been added
      * @see \Magento\User\Model\Spi\NotificatorInterface
      */
     const XML_PATH_FORGOT_EMAIL_TEMPLATE = 'admin/emails/forgot_email_template';
 
     /**
-     * @deprecated
+     * @deprecated New functionality has been added
      * @see \Magento\User\Model\Spi\NotificatorInterface
      */
     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'admin/emails/forgot_email_identity';
 
     /**
-     * @deprecated
+     * @deprecated New functionality has been added
      * @see \Magento\User\Model\Spi\NotificatorInterface
      */
     const XML_PATH_USER_NOTIFICATION_TEMPLATE = 'admin/emails/user_notification_template';
 
     /**
      * Configuration paths for admin user reset password email template
      *
-     * @deprecated
+     * @deprecated New functionality has been added
      */
     const XML_PATH_RESET_PASSWORD_TEMPLATE = 'admin/emails/reset_password_template';
 
@@ -399,7 +400,7 @@ public function saveExtra($data)
      * Retrieve user roles
      *
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getRoles()
     {
@@ -566,7 +567,7 @@ public function getAclRole()
      * @param string $username
      * @param string $password
      * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function authenticate($username, $password)
     {
@@ -588,7 +589,7 @@ public function authenticate($username, $password)
                 'admin_user_authenticate_after',
                 ['username' => $username, 'password' => $password, 'user' => $this, 'result' => $result]
             );
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->unsetData();
             throw $e;
         }
@@ -632,7 +633,7 @@ public function verifyIdentity($password)
      * @param string $username
      * @param string $password
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function login($username, $password)
     {
@@ -665,7 +666,7 @@ public function loadByUsername($username)
     {
         $data = $this->getResource()->loadByUsername($username);
         if ($data !== false) {
-            if (is_string($data['extra'])) {
+            if (isset($data['extra']) && is_string($data['extra'])) {
                 $data['extra'] = $this->serializer->unserialize($data['extra']);
             }
 
@@ -678,7 +679,7 @@ public function loadByUsername($username)
     /**
      * Check if user is assigned to any role
      *
-     * @param int|\Magento\User\Model\User $user
+     * @param int|User $user
      * @return null|array
      */
     public function hasAssigned2Role($user)
@@ -704,12 +705,12 @@ protected function _getEncodedPassword($password)
      *
      * @param string $newToken
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function changeResetPasswordLinkToken($newToken)
     {
         if (!is_string($newToken) || empty($newToken)) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('The password reset token is incorrect. Verify the token and try again.')
             );
         }