@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Rename Lisk internal getProperties() methods to avoid collisions
Summary:
See some discussion here:
https://github.com/phacility/phabricator/commit/24a6eeb8d8a52b592e456d110934670d4ace9b31#commitcomment-7334892
The `protected $properties;` storage parameter added to `ProjectColumn` is shadowed by `getProperties()` in the base class.
Although this works correctly for me, it's ambiguous and worth fixing. Make the base class methods explicit.
Test Plan: Used `grep` to find callers for both methods and renamed them.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Differential Revision: https://secure.phabricator.com/D10210
+6
-6
+6
-6
src/infrastructure/storage/lisk/LiskDAO.php
+6
-6
src/infrastructure/storage/lisk/LiskDAO.php
···
855
855
*
856
856
* @task info
857
857
*/
858
-
protected function getProperties() {
858
+
protected function getAllLiskProperties() {
859
859
static $properties = null;
860
860
if (!isset($properties)) {
861
861
$class = new ReflectionClass(get_class($this));
···
893
893
protected function checkProperty($property) {
894
894
static $properties = null;
895
895
if ($properties === null) {
896
-
$properties = $this->getProperties();
896
+
$properties = $this->getAllLiskProperties();
897
897
}
898
898
899
899
$property = strtolower($property);
···
980
980
*
981
981
* @task info
982
982
*/
983
-
protected function getPropertyValues() {
983
+
protected function getAllLiskPropertyValues() {
984
984
$map = array();
985
-
foreach ($this->getProperties() as $p) {
985
+
foreach ($this->getAllLiskProperties() as $p) {
986
986
// We may receive a warning here for properties we've implicitly added
987
987
// through configuration; squelch it.
988
988
$map[$p] = @$this->$p;
···
1070
1070
$this->isEphemeralCheck();
1071
1071
1072
1072
$this->willSaveObject();
1073
-
$data = $this->getPropertyValues();
1073
+
$data = $this->getAllLiskPropertyValues();
1074
1074
$this->willWriteData($data);
1075
1075
1076
1076
$map = array();
···
1139
1139
*/
1140
1140
protected function insertRecordIntoDatabase($mode) {
1141
1141
$this->willSaveObject();
1142
-
$data = $this->getPropertyValues();
1142
+
$data = $this->getAllLiskPropertyValues();
1143
1143
1144
1144
$conn = $this->establishConnection('w');
1145
1145