Page MenuHomePhorge
Differential D25317

Fix "Register with Approval flow" for php 8
ClosedPublic
Actions

Authored by avivey on Jun 30 2023, 08:34.
Tags
None
Referenced Files
F3354999: D25317.1743868272.diff
Fri, Apr 4, 15:51
F3350926: D25317.1743778702.diff
Thu, Apr 3, 14:58
F3342787: D25317.1743669206.diff
Wed, Apr 2, 08:33
F3341885: D25317.1743658392.diff
Wed, Apr 2, 05:33
F3341658: D25317.1743655594.diff
Wed, Apr 2, 04:46
F3329873: D25317.1743480530.diff
Mon, Mar 31, 04:08
F3321296: D25317.1743351505.diff
Sat, Mar 29, 16:18
F3305682: D25317.1743118688.diff
Wed, Mar 26, 23:38
View All 39 Files
Subscribers
Cigaryno
Matthew
speck
tobiaswiese
valerio.bozzolan

Details

Reviewers
chris
Group Reviewers
O1: Blessed Committers
Maniphest Tasks
T15064: Make Phorge compatible with PHP 8.1/8.2/8.3/8.4
Commits
rPd725ffaa7728: Fix "Register with Approval flow" for php 8
Summary

Ref T15064.

Test Plan
  • Register as a new user
  • as admin, view user's page and approve it
  • As new user, hit "wait patiently" to go back to Home

No crashes in this flow.

Diff Detail

Repository
rP Phorge
Branch
register-80
Lint
Lint Passed
Unit
Tests Passed
Build Status
Buildable 612
Build 612: arc lint + arc unit

Event Timeline

avivey created this revision.Jun 30 2023, 08:34
Owners added a reviewer: O1: Blessed Committers.Jun 30 2023, 08:34
Herald added subscribers: Cigaryno, Matthew, valerio.bozzolan and 2 others. · View Herald TranscriptJun 30 2023, 08:34
avivey requested review of this revision.Jun 30 2023, 08:34
Harbormaster completed remote builds in B612: Diff 1037.Jun 30 2023, 08:34
valerio.bozzolan added inline comments.Jun 30 2023, 08:37
src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
153

If I understand correctly this removes empty lines.

In your opinion, where does an empty blocklist entry come from?

avivey added inline comments.Jun 30 2023, 08:52
src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
153

Removes empty ("falsy", probably) entries.
The blocklist is made up of a bunch of different sources - possibly some of them can only be null in debug mode; I wasn't able to determine which one was null in this case.

chris accepted this revision.Jun 30 2023, 11:33
This revision is now accepted and ready to land.Jun 30 2023, 11:33
Closed by commit rPd725ffaa7728: Fix "Register with Approval flow" for php 8. · Explain WhyJul 2 2023, 15:49
This revision was automatically updated to reflect the committed changes.
avivey added a commit: rPd725ffaa7728: Fix "Register with Approval flow" for php 8.

Revision Contents
Changeset List

Diff 1037

View Options

src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php

Show First 20 Lines • Show All 290 Lines • ▼ Show 20 Lines $comment_box = id(new PHUIObjectBoxView())
->appendChild($comment); ->appendChild($comment);
return array($comment_box, $preview); return array($comment_box, $preview);
} }
private function renderCommentPanel() { private function renderCommentPanel() {
$viewer = $this->getViewer(); $viewer = $this->getViewer();
// Set a placeholder text in the comment field defined via
// getCommentFieldPlaceholderText() in the object's EditEngine class
$placeholder_text = '';
$object_phid = $this->getObjectPHID();
aviveyUnsubmitted
Done
Inline Actions

method_exists can be replaced with a concrete method in the base class.

avivey: `method_exists` can be replaced with a concrete method in the base class.
$phid_types = mpull(PhabricatorPHIDType::getAllInstalledTypes($viewer),
valerio.bozzolanUnsubmitted
Done
Inline Actions
$query = id(new ManiphestTaskQuery())
- ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->setViewer($viewer)
->needSubscriberPHIDs(false)

Have you already tried this?

valerio.bozzolan: Have you already tried this?
null, 'getTypeConstant');
$object_type = idx($phid_types, phid_get_type($object_phid));
// Find matching EditEngine for our object via ApplicationClasses
if ($object_type) {
$app_class = $object_type->getPHIDTypeApplicationClass();
$engines = id(new PhabricatorEditEngineQuery())
->setViewer($this->getViewer())
->execute();
$engines = mpull($engines, null, 'getEngineApplicationClass');
$engine = idx($engines, $app_class);
$engine_class = get_class($engine);
if (method_exists($engine_class, 'getCommentFieldPlaceholderText')) {
$placeholder_text =
$engine->getCommentFieldPlaceholderText($object_phid);
}
}
$remarkup_control = id(new PhabricatorRemarkupControl()) $remarkup_control = id(new PhabricatorRemarkupControl())
->setViewer($viewer) ->setViewer($viewer)
->setID($this->getCommentID()) ->setID($this->getCommentID())
->addClass('phui-comment-fullwidth-control') ->addClass('phui-comment-fullwidth-control')
->addClass('phui-comment-textarea-control') ->addClass('phui-comment-textarea-control')
->setCanPin(true) ->setCanPin(true)
->setPlaceholder($placeholder_text)
->setName('comment'); ->setName('comment');
$draft_comment = ''; $draft_comment = '';
$draft_metadata = array(); $draft_metadata = array();
$draft_key = null; $draft_key = null;
$legacy_draft = $this->getDraft(); $legacy_draft = $this->getDraft();
if ($legacy_draft) { if ($legacy_draft) {
▲ Show 20 Lines • Show All 327 Lines • Show Last 20 Lines
View Options

src/applications/auth/engine/PhabricatorAuthPasswordEngine.php

Show First 20 Lines • Show All 290 Lines • ▼ Show 20 Lines $comment_box = id(new PHUIObjectBoxView())
->appendChild($comment); ->appendChild($comment);
return array($comment_box, $preview); return array($comment_box, $preview);
} }
private function renderCommentPanel() { private function renderCommentPanel() {
$viewer = $this->getViewer(); $viewer = $this->getViewer();
// Set a placeholder text in the comment field defined via
// getCommentFieldPlaceholderText() in the object's EditEngine class
$placeholder_text = '';
$object_phid = $this->getObjectPHID();
aviveyUnsubmitted
Done
Inline Actions

method_exists can be replaced with a concrete method in the base class.

avivey: `method_exists` can be replaced with a concrete method in the base class.
$phid_types = mpull(PhabricatorPHIDType::getAllInstalledTypes($viewer),
valerio.bozzolanUnsubmitted
Done
Inline Actions
$query = id(new ManiphestTaskQuery())
- ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->setViewer($viewer)
->needSubscriberPHIDs(false)

Have you already tried this?

valerio.bozzolan: Have you already tried this?
null, 'getTypeConstant');
$object_type = idx($phid_types, phid_get_type($object_phid));
// Find matching EditEngine for our object via ApplicationClasses
if ($object_type) {
$app_class = $object_type->getPHIDTypeApplicationClass();
$engines = id(new PhabricatorEditEngineQuery())
->setViewer($this->getViewer())
->execute();
$engines = mpull($engines, null, 'getEngineApplicationClass');
$engine = idx($engines, $app_class);
$engine_class = get_class($engine);
if (method_exists($engine_class, 'getCommentFieldPlaceholderText')) {
$placeholder_text =
$engine->getCommentFieldPlaceholderText($object_phid);
}
}
$remarkup_control = id(new PhabricatorRemarkupControl()) $remarkup_control = id(new PhabricatorRemarkupControl())
->setViewer($viewer) ->setViewer($viewer)
->setID($this->getCommentID()) ->setID($this->getCommentID())
->addClass('phui-comment-fullwidth-control') ->addClass('phui-comment-fullwidth-control')
->addClass('phui-comment-textarea-control') ->addClass('phui-comment-textarea-control')
->setCanPin(true) ->setCanPin(true)
->setPlaceholder($placeholder_text)
->setName('comment'); ->setName('comment');
$draft_comment = ''; $draft_comment = '';
$draft_metadata = array(); $draft_metadata = array();
$draft_key = null; $draft_key = null;
$legacy_draft = $this->getDraft(); $legacy_draft = $this->getDraft();
if ($legacy_draft) { if ($legacy_draft) {
▲ Show 20 Lines • Show All 327 Lines • Show Last 20 Lines
View Options

src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php

Show First 20 Lines • Show All 290 Lines • ▼ Show 20 Lines $comment_box = id(new PHUIObjectBoxView())
->appendChild($comment); ->appendChild($comment);
return array($comment_box, $preview); return array($comment_box, $preview);
} }
private function renderCommentPanel() { private function renderCommentPanel() {
$viewer = $this->getViewer(); $viewer = $this->getViewer();
// Set a placeholder text in the comment field defined via
// getCommentFieldPlaceholderText() in the object's EditEngine class
$placeholder_text = '';
$object_phid = $this->getObjectPHID();
aviveyUnsubmitted
Done
Inline Actions

method_exists can be replaced with a concrete method in the base class.

avivey: `method_exists` can be replaced with a concrete method in the base class.
$phid_types = mpull(PhabricatorPHIDType::getAllInstalledTypes($viewer),
valerio.bozzolanUnsubmitted
Done
Inline Actions
$query = id(new ManiphestTaskQuery())
- ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->setViewer($viewer)
->needSubscriberPHIDs(false)

Have you already tried this?

valerio.bozzolan: Have you already tried this?
null, 'getTypeConstant');
$object_type = idx($phid_types, phid_get_type($object_phid));
// Find matching EditEngine for our object via ApplicationClasses
if ($object_type) {
$app_class = $object_type->getPHIDTypeApplicationClass();
$engines = id(new PhabricatorEditEngineQuery())
->setViewer($this->getViewer())
->execute();
$engines = mpull($engines, null, 'getEngineApplicationClass');
$engine = idx($engines, $app_class);
$engine_class = get_class($engine);
if (method_exists($engine_class, 'getCommentFieldPlaceholderText')) {
$placeholder_text =
$engine->getCommentFieldPlaceholderText($object_phid);
}
}
$remarkup_control = id(new PhabricatorRemarkupControl()) $remarkup_control = id(new PhabricatorRemarkupControl())
->setViewer($viewer) ->setViewer($viewer)
->setID($this->getCommentID()) ->setID($this->getCommentID())
->addClass('phui-comment-fullwidth-control') ->addClass('phui-comment-fullwidth-control')
->addClass('phui-comment-textarea-control') ->addClass('phui-comment-textarea-control')
->setCanPin(true) ->setCanPin(true)
->setPlaceholder($placeholder_text)
->setName('comment'); ->setName('comment');
$draft_comment = ''; $draft_comment = '';
$draft_metadata = array(); $draft_metadata = array();
$draft_key = null; $draft_key = null;
$legacy_draft = $this->getDraft(); $legacy_draft = $this->getDraft();
if ($legacy_draft) { if ($legacy_draft) {
▲ Show 20 Lines • Show All 327 Lines • Show Last 20 Lines
Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0