Merge pull request #231 from FatBoyXPC/dry-datamapper

DRY things up a bit
This commit is contained in:
Dominik Liebler
2016-09-21 14:47:16 +02:00
committed by GitHub
2 changed files with 5 additions and 6 deletions

View File

@ -22,8 +22,7 @@ class Value implements ValueInterface
*/ */
public function __construct(Attribute $attribute) public function __construct(Attribute $attribute)
{ {
$attribute->addValue($this); $this->setAttribute($attribute);
$this->attribute = $attribute;
} }
/** /**
@ -33,7 +32,7 @@ class Value implements ValueInterface
*/ */
public function setAttribute(Attribute $attribute) public function setAttribute(Attribute $attribute)
{ {
$this->attribute->removeValue($this); // Remove value from current attribute $this->attribute && $this->attribute->removeValue($this); // Remove value from current attribute
$attribute->addValue($this); // Add value to new attribute $attribute->addValue($this); // Add value to new attribute
$this->attribute = $attribute; $this->attribute = $attribute;

View File

@ -33,9 +33,9 @@ class User
*/ */
public function __construct($id = null, $username = null, $email = null) public function __construct($id = null, $username = null, $email = null)
{ {
$this->userId = $id; $this->setUserID($id);
$this->username = $username; $this->setUsername($username);
$this->email = $email; $this->setEmail($email);
} }
/** /**