revert merge changes (#22833: Short-term admin accounts)

magento · Jun 21, 2019 · e4ec0e2 · e4ec0e2
1 parent 3c608fd
commit e4ec0e2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/app/code/Magento/User/Model/ResourceModel/User/Collection.php b/app/code/Magento/User/Model/ResourceModel/User/Collection.php
@@ -27,7 +27,6 @@ protected function _construct()
      * Collection Init Select
      *
      * @return $this
-     * @since 101.1.0
      */
     protected function _initSelect()
     {

diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
@@ -115,12 +115,12 @@ class User extends AbstractModel implements StorageInterface, UserInterface
     protected $_encryptor;
 
     /**
-     * @deprecated 101.1.0
+     * @deprecated
      */
     protected $_transportBuilder;
 
     /**
-     * @deprecated 101.1.0
+     * @deprecated
      */
     protected $_storeManager;
 
@@ -140,7 +140,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
     private $notificator;
 
     /**
-     * @deprecated 101.1.0
+     * @deprecated
      */
     private $deploymentConfig;
 
@@ -212,9 +212,14 @@ protected function _construct()
      * Removing dependencies and leaving only entity's properties.
      *
      * @return string[]
+     *
+     * @SuppressWarnings(PHPMD.SerializationAware)
+     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
+
         $properties = parent::__sleep();
         return array_diff(
             $properties,
@@ -240,9 +245,14 @@ public function __sleep()
      * Restoring required objects after serialization.
      *
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.SerializationAware)
+     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
+        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
+
         parent::__wakeup();
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->serializer = $objectManager->get(Json::class);
@@ -406,6 +416,10 @@ public function getRoles()
      */
     public function getRole()
     {
+        if ($this->getData('extracted_role')) {
+            $this->_role = $this->getData('extracted_role');
+            $this->unsetData('extracted_role');
+        }
         if (null === $this->_role) {
             $this->_role = $this->_roleFactory->create();
             $roles = $this->getRoles();
@@ -441,7 +455,7 @@ public function roleUserExists()
     /**
      * Send email with reset password confirmation link.
      *
-     * @deprecated 101.1.0
+     * @deprecated
      * @see NotificatorInterface::sendForgotPassword()
      *
      * @return $this
@@ -521,7 +535,7 @@ protected function createChangesDescriptionString()
      * @throws NotificationExceptionInterface
      * @return $this
      * @since 100.1.0
-     * @deprecated 101.1.0
+     * @deprecated
      * @see NotificatorInterface::sendUpdated()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */