Skip to content

Commit 272de67

Browse files
ENH Use new DataList caching (#610)
Replaces deprecated `DataObject::get_one()` and `DataObject::get_by_id()` in favour of the new DataList query caching.
1 parent 381f4d4 commit 272de67

5 files changed

Lines changed: 6 additions & 8 deletions

File tree

src/Extension/AccountReset/MemberExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ public function generateAccountResetTokenAndStoreHash(): string
4848
$token = $generator->randomToken();
4949
$hash = $this->owner->encryptWithUserSettings($token);
5050
} while (
51-
DataObject::get_one(Member::class, [
52-
'"Member"."AccountResetHash"' => $hash,
53-
])
51+
Member::get()->setUseCache(true)->find('AccountResetHash', $hash)
5452
);
5553

5654
$this->owner->AccountResetHash = $hash;

src/FormField/RegisteredMFAMethodListField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getSchemaDataDefaults()
4646
if (!$this->value && $this->getForm() && $this->getForm()->getRecord() instanceof Member) {
4747
$member = $this->getForm()->getRecord();
4848
} else {
49-
$member = DataObject::get_by_id(Member::class, $this->value);
49+
$member = Member::get()->setUseCache(true)->byID($this->value);
5050
}
5151

5252
return array_merge($defaults, [

src/Store/SessionStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function __construct(Member $member)
7171
public function getMember(): ?Member
7272
{
7373
if (!$this->member && $this->memberID) {
74-
$this->member = DataObject::get_by_id(Member::class, $this->memberID);
74+
$this->member = Member::get()->setUseCache(true)->byID($this->memberID);
7575
}
7676

7777
return $this->member;

tests/php/BackupCode/VerifyHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testVerifyInvalidatesCodesThatHaveBeenUsed()
4444
list ($request, $store, $method) = $this->scaffoldVerifyParams('123456');
4545
$this->assertTrue($handler->verify($request, $store, $method)->isSuccessful());
4646

47-
$method = DataObject::get_by_id(RegisteredMethod::class, $method->ID);
47+
$method = RegisteredMethod::get()->setUseCache(true)->byID($method->ID);
4848
$codes = json_decode($method->Data ?? '', true);
4949

5050
$this->assertCount(3, $codes, 'Only 3 codes remain against the method');

tests/php/Service/RegisteredMethodManagerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ public function testDeletingLastMethodRemovesBackupCodes()
184184

185185
$this->assertCount(0, $member->RegisteredMFAMethods());
186186

187-
$this->assertNull(DataObject::get_by_id(RegisteredMethod::class, $backupMethod->ID));
188-
$this->assertNull(DataObject::get_by_id(RegisteredMethod::class, $mathMethod->ID));
187+
$this->assertNull(RegisteredMethod::get()->setUseCache(true)->byID($backupMethod->ID));
188+
$this->assertNull(RegisteredMethod::get()->setUseCache(true)->byID($mathMethod->ID));
189189
}
190190

191191
public function testCanRemoveTheOnlyMethodWhenMFAIsOptional()

0 commit comments

Comments
 (0)