mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-23 05:50:55 +01:00
Declare common Lisk properties
Summary: Calling `->setPHID()` or other common Lisk setters creates an implicit public property `$phid`. I don't like implicit properties and I see them as errors. Its public visibility also makes me nervous and is vulnerable to bypassing any setters we may create. Test Plan: Loaded homepage, checked log. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D3600
This commit is contained in:
parent
92aaffd0c5
commit
7c39c4ca7d
1 changed files with 15 additions and 12 deletions
|
@ -209,6 +209,12 @@ abstract class LiskDAO {
|
|||
|
||||
private $inSet = null;
|
||||
|
||||
protected $id;
|
||||
protected $phid;
|
||||
protected $version;
|
||||
protected $dateCreated;
|
||||
protected $dateModified;
|
||||
|
||||
/**
|
||||
* Build an empty object.
|
||||
*
|
||||
|
@ -920,24 +926,21 @@ abstract class LiskDAO {
|
|||
}
|
||||
|
||||
$id_key = $this->getIDKey();
|
||||
if ($id_key) {
|
||||
if (!isset($properties[strtolower($id_key)])) {
|
||||
$properties[strtolower($id_key)] = $id_key;
|
||||
}
|
||||
if ($id_key != 'id') {
|
||||
unset($properties['id']);
|
||||
}
|
||||
|
||||
if ($this->getConfigOption(self::CONFIG_OPTIMISTIC_LOCKS)) {
|
||||
$properties['version'] = 'version';
|
||||
if (!$this->getConfigOption(self::CONFIG_OPTIMISTIC_LOCKS)) {
|
||||
unset($properties['version']);
|
||||
}
|
||||
|
||||
if ($this->getConfigOption(self::CONFIG_TIMESTAMPS)) {
|
||||
$properties['datecreated'] = 'dateCreated';
|
||||
$properties['datemodified'] = 'dateModified';
|
||||
if (!$this->getConfigOption(self::CONFIG_TIMESTAMPS)) {
|
||||
unset($properties['datecreated']);
|
||||
unset($properties['datemodified']);
|
||||
}
|
||||
|
||||
if (!$this->isPHIDPrimaryID() &&
|
||||
$this->getConfigOption(self::CONFIG_AUX_PHID)) {
|
||||
$properties['phid'] = 'phid';
|
||||
if ($id_key != 'phid' && !$this->getConfigOption(self::CONFIG_AUX_PHID)) {
|
||||
unset($properties['phid']);
|
||||
}
|
||||
}
|
||||
return $properties;
|
||||
|
|
Loading…
Reference in a new issue