From aceebaa4305332265a371282a841609fe926b819 Mon Sep 17 00:00:00 2001 From: Pppery Date: Sun, 4 Jan 2026 17:31:57 -0500 Subject: [PATCH] Revert "Remove call to undefined method DoorkeeperDAO::getObjectKey()" Summary: This reverts commit a039c4952f6b13f380e2df3a8989c856c87bb952. This doesn't do what it is supposed to and probably causes bad things to happen. See more details at T15894#29636 Test Plan: In a PHP interactive shell: - (Run `require_once 'scripts/init/__init_script__.php'` and ignore the output buffering error to get into an environment where Phorge classes can load) - Run `$x = new DoorkeeperExternalObject()` - Evaluate `$x->getObjectKey()` - See some meaningless string of characters. - Run `$x->setObjectKey('foo');` - Evaluate `$x->getObjectKey()` - With this patch, see `foo`. Without this patch see the same meaningless string of characters you saw above. Beyond that extremely-low-level test, unclear. Reviewers: O1 Blessed Committers, aklapper Reviewed By: O1 Blessed Committers, aklapper Subscribers: aklapper, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Differential Revision: https://we.phorge.it/D26656 --- .../doorkeeper/storage/DoorkeeperExternalObject.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/applications/doorkeeper/storage/DoorkeeperExternalObject.php b/src/applications/doorkeeper/storage/DoorkeeperExternalObject.php index a6d4704a90..a4ce41adac 100644 --- a/src/applications/doorkeeper/storage/DoorkeeperExternalObject.php +++ b/src/applications/doorkeeper/storage/DoorkeeperExternalObject.php @@ -60,7 +60,11 @@ final class DoorkeeperExternalObject extends DoorkeeperDAO } public function getObjectKey() { - return $this->getRef()->getObjectKey(); + $key = parent::getObjectKey(); + if ($key === null) { + $key = $this->getRef()->getObjectKey(); + } + return $key; } public function getRef() { -- 2.51.2