Skip to content

Commit 5899526

Browse files
neandrakeneandrake
committed
Addressing some PHP8 incompatibilities - ProfileMenuItem
Summary: Updates to all of the `ProfileMenuItem` classes to be compatible with PHP 8. These changes were moved from D21862. Refs T13588 Test Plan: I loaded the profile page for a user and saw all the items I expected to see. I navigated through the different profile nav items. I loaded the settings page for a user and saw all the items I expected to see. I navigated through the differnt setting nave items. I added Cat Facts to my navigation. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T13588 Differential Revision: https://secure.phabricator.com/D21863
1 parent f6214f0 commit 5899526

27 files changed

+132
-252
lines changed

‎src/applications/home/menuitem/PhabricatorHomeLauncherProfileMenuItem.php‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ private function getDefaultName() {
1313
return pht('More Applications');
1414
}
1515

16+
public function getDisplayName(
17+
PhabricatorProfileMenuItemConfiguration $config) {
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
20+
}
21+
1622
public function getMenuItemTypeIcon() {
1723
return 'fa-ellipsis-h';
1824
}
@@ -27,17 +33,6 @@ public function canMakeDefault(
2733
return false;
2834
}
2935

30-
public function getDisplayName(
31-
PhabricatorProfileMenuItemConfiguration $config) {
32-
$name = $config->getMenuItemProperty('name');
33-
34-
if (strlen($name)) {
35-
return $name;
36-
}
37-
38-
return $this->getDefaultName();
39-
}
40-
4136
public function buildEditEngineFields(
4237
PhabricatorProfileMenuItemConfiguration $config) {
4338
return array(

‎src/applications/home/menuitem/PhabricatorHomeProfileMenuItem.php‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ private function getDefaultName() {
1313
return pht('Home');
1414
}
1515

16+
public function getDisplayName(
17+
PhabricatorProfileMenuItemConfiguration $config) {
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
20+
}
21+
1622
public function getMenuItemTypeIcon() {
1723
return 'fa-home';
1824
}
@@ -22,17 +28,6 @@ public function canMakeDefault(
2228
return true;
2329
}
2430

25-
public function getDisplayName(
26-
PhabricatorProfileMenuItemConfiguration $config) {
27-
$name = $config->getMenuItemProperty('name');
28-
29-
if (strlen($name)) {
30-
return $name;
31-
}
32-
33-
return $this->getDefaultName();
34-
}
35-
3631
public function newPageContent(
3732
PhabricatorProfileMenuItemConfiguration $config) {
3833
$viewer = $this->getViewer();

‎src/applications/people/menuitem/PhabricatorPeopleBadgesProfileMenuItem.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@ private function getDefaultName() {
1313
return pht('Badges');
1414
}
1515

16-
public function canHideMenuItem(
16+
public function getDisplayName(
1717
PhabricatorProfileMenuItemConfiguration $config) {
18-
return true;
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
1920
}
2021

21-
public function getDisplayName(
22+
public function canHideMenuItem(
2223
PhabricatorProfileMenuItemConfiguration $config) {
23-
$name = $config->getMenuItemProperty('name');
24-
25-
if (strlen($name)) {
26-
return $name;
27-
}
28-
29-
return $this->getDefaultName();
24+
return true;
3025
}
3126

3227
public function buildEditEngineFields(

‎src/applications/people/menuitem/PhabricatorPeopleCommitsProfileMenuItem.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@ private function getDefaultName() {
1313
return pht('Commits');
1414
}
1515

16-
public function canHideMenuItem(
16+
public function getDisplayName(
1717
PhabricatorProfileMenuItemConfiguration $config) {
18-
return true;
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
1920
}
2021

21-
public function getDisplayName(
22+
public function canHideMenuItem(
2223
PhabricatorProfileMenuItemConfiguration $config) {
23-
$name = $config->getMenuItemProperty('name');
24-
25-
if (strlen($name)) {
26-
return $name;
27-
}
28-
29-
return $this->getDefaultName();
24+
return true;
3025
}
3126

3227
public function buildEditEngineFields(

‎src/applications/people/menuitem/PhabricatorPeopleDetailsProfileMenuItem.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,8 @@ private function getDefaultName() {
1515

1616
public function getDisplayName(
1717
PhabricatorProfileMenuItemConfiguration $config) {
18-
$name = $config->getMenuItemProperty('name');
19-
20-
if (strlen($name)) {
21-
return $name;
22-
}
23-
24-
return $this->getDefaultName();
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
2520
}
2621

2722
public function buildEditEngineFields(

‎src/applications/people/menuitem/PhabricatorPeopleManageProfileMenuItem.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@ private function getDefaultName() {
1313
return pht('Manage');
1414
}
1515

16-
public function canHideMenuItem(
16+
public function getDisplayName(
1717
PhabricatorProfileMenuItemConfiguration $config) {
18-
return false;
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
1920
}
2021

21-
public function getDisplayName(
22+
public function canHideMenuItem(
2223
PhabricatorProfileMenuItemConfiguration $config) {
23-
$name = $config->getMenuItemProperty('name');
24-
25-
if (strlen($name)) {
26-
return $name;
27-
}
28-
29-
return $this->getDefaultName();
24+
return false;
3025
}
3126

3227
public function buildEditEngineFields(

‎src/applications/people/menuitem/PhabricatorPeoplePictureProfileMenuItem.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ private function getDefaultName() {
1313
return pht('User Picture');
1414
}
1515

16-
public function canHideMenuItem(
16+
public function getDisplayName(
1717
PhabricatorProfileMenuItemConfiguration $config) {
18-
return false;
18+
return $this->getDefaultName();
1919
}
2020

21-
public function getDisplayName(
21+
public function canHideMenuItem(
2222
PhabricatorProfileMenuItemConfiguration $config) {
23-
return $this->getDefaultName();
23+
return false;
2424
}
2525

2626
public function buildEditEngineFields(

‎src/applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@ private function getDefaultName() {
1313
return pht('Revisions');
1414
}
1515

16-
public function canHideMenuItem(
16+
public function getDisplayName(
1717
PhabricatorProfileMenuItemConfiguration $config) {
18-
return true;
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
1920
}
2021

21-
public function getDisplayName(
22+
public function canHideMenuItem(
2223
PhabricatorProfileMenuItemConfiguration $config) {
23-
$name = $config->getMenuItemProperty('name');
24-
25-
if (strlen($name)) {
26-
return $name;
27-
}
28-
29-
return $this->getDefaultName();
24+
return true;
3025
}
3126

3227
public function buildEditEngineFields(

‎src/applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@ private function getDefaultName() {
1313
return pht('Tasks');
1414
}
1515

16-
public function canHideMenuItem(
16+
public function getDisplayName(
1717
PhabricatorProfileMenuItemConfiguration $config) {
18-
return true;
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
1920
}
2021

21-
public function getDisplayName(
22+
public function canHideMenuItem(
2223
PhabricatorProfileMenuItemConfiguration $config) {
23-
$name = $config->getMenuItemProperty('name');
24-
25-
if (strlen($name)) {
26-
return $name;
27-
}
28-
29-
return $this->getDefaultName();
24+
return true;
3025
}
3126

3227
public function buildEditEngineFields(

‎src/applications/project/menuitem/PhabricatorProjectDetailsProfileMenuItem.php‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ private function getDefaultName() {
1313
return pht('Project Details');
1414
}
1515

16+
public function getDisplayName(
17+
PhabricatorProfileMenuItemConfiguration $config) {
18+
$default = $this->getDefaultName();
19+
return $this->getNameFromConfig($config, $default);
20+
}
21+
1622
public function getMenuItemTypeIcon() {
1723
return 'fa-file-text-o';
1824
}
@@ -27,17 +33,6 @@ public function canMakeDefault(
2733
return true;
2834
}
2935

30-
public function getDisplayName(
31-
PhabricatorProfileMenuItemConfiguration $config) {
32-
$name = $config->getMenuItemProperty('name');
33-
34-
if (strlen($name)) {
35-
return $name;
36-
}
37-
38-
return $this->getDefaultName();
39-
}
40-
4136
public function buildEditEngineFields(
4237
PhabricatorProfileMenuItemConfiguration $config) {
4338
return array(

0 commit comments

Comments
 (0)