Skip to content

Commit 40a3f6a

Browse files
committed
MAGETWO-37464: Merge and Fix Builds
- Use setData() instead of directly manipulating _data hash array for setters of \Magento\User\Model\User
1 parent c01460e commit 40a3f6a

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -707,8 +707,7 @@ public function getFirstName()
707707
*/
708708
public function setFirstName($firstName)
709709
{
710-
$this->_data['firstname'] = $firstName;
711-
return $this;
710+
return $this->setData('firstname', $firstName);
712711
}
713712

714713
/**
@@ -724,8 +723,7 @@ public function getLastName()
724723
*/
725724
public function setLastName($lastName)
726725
{
727-
$this->_data['lastname'] = $lastName;
728-
return $this;
726+
return $this->setData('lastname', $lastName);
729727
}
730728

731729
/**
@@ -741,8 +739,7 @@ public function getEmail()
741739
*/
742740
public function setEmail($email)
743741
{
744-
$this->_data['email'] = $email;
745-
return $this;
742+
return $this->setData('email', $email);
746743
}
747744

748745
/**
@@ -758,8 +755,7 @@ public function getUserName()
758755
*/
759756
public function setUserName($userName)
760757
{
761-
$this->_data['username'] = $userName;
762-
return $this;
758+
return $this->setData('username', $userName);
763759
}
764760

765761
/**
@@ -775,8 +771,7 @@ public function getPassword()
775771
*/
776772
public function setPassword($password)
777773
{
778-
$this->_data['password'] = $password;
779-
return $this;
774+
return $this->setData('password', $password);
780775
}
781776

782777
/**
@@ -792,8 +787,7 @@ public function getCreated()
792787
*/
793788
public function setCreated($created)
794789
{
795-
$this->_data['created'] = $created;
796-
return $this;
790+
return $this->setData('created', $created);
797791
}
798792

799793
/**
@@ -809,8 +803,7 @@ public function getModified()
809803
*/
810804
public function setModified($modified)
811805
{
812-
$this->_data['modified'] = $modified;
813-
return $this;
806+
return $this->setData('modified', $modified);
814807
}
815808

816809
/**
@@ -826,8 +819,7 @@ public function getIsActive()
826819
*/
827820
public function setIsActive($isActive)
828821
{
829-
$this->_data['is_active'] = $isActive;
830-
return $this;
822+
return $this->setData('is_active', $isActive);
831823
}
832824

833825
/**
@@ -843,7 +835,6 @@ public function getInterfaceLocale()
843835
*/
844836
public function setInterfaceLocale($interfaceLocale)
845837
{
846-
$this->_data['interface_locale'] = $interfaceLocale;
847-
return $this;
838+
return $this->setData('interface_locale', $interfaceLocale);
848839
}
849840
}

0 commit comments

Comments
 (0)