tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5' into 6

Browse Source
This commit is contained in:
github-actions 2024-07-29 21:19:22 +00:00
commit f6af6300b0
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Core/CustomMethods.php
View File

@ -171,11 +171,11 @@ trait CustomMethods
} }
// Lazy define methods // Lazy define methods
$lowerClass = strtolower(static::class); $lowerClass = strtolower(static::class);
if (!isset(self::$extra_methods[$lowerClass])) { if (!isset(self::class::$extra_methods[$lowerClass])) {
$this->defineMethods(); $this->defineMethods();
} }
return self::$extra_methods[$lowerClass][strtolower($method)] ?? null; return self::class::$extra_methods[$lowerClass][strtolower($method)] ?? null;
} }
/** /**
@ -190,8 +190,8 @@ trait CustomMethods
// Query extra methods // Query extra methods
$lowerClass = strtolower(static::class); $lowerClass = strtolower(static::class);
if ($custom && isset(self::$extra_methods[$lowerClass])) { if ($custom && isset(self::class::$extra_methods[$lowerClass])) {
$methods = array_merge(self::$extra_methods[$lowerClass], $methods); $methods = array_merge(self::class::$extra_methods[$lowerClass], $methods);
} }
return $methods; return $methods;
@ -207,19 +207,19 @@ trait CustomMethods
{ {
$class = is_object($class) ? get_class($class) : ($class ?: static::class); $class = is_object($class) ? get_class($class) : ($class ?: static::class);
$lowerClass = strtolower($class); $lowerClass = strtolower($class);
if (isset(self::$built_in_methods[$lowerClass])) { if (isset(self::class::$built_in_methods[$lowerClass])) {
return self::$built_in_methods[$lowerClass]; return self::class::$built_in_methods[$lowerClass];
} }
// Build new list // Build new list
$reflection = new ReflectionClass($class); $reflection = new ReflectionClass($class);
$methods = $reflection->getMethods(ReflectionMethod::IS_PUBLIC); $methods = $reflection->getMethods(ReflectionMethod::IS_PUBLIC);
self::$built_in_methods[$lowerClass] = []; self::class::$built_in_methods[$lowerClass] = [];
foreach ($methods as $method) { foreach ($methods as $method) {
$name = $method->getName(); $name = $method->getName();
self::$built_in_methods[$lowerClass][strtolower($name)] = $name; self::class::$built_in_methods[$lowerClass][strtolower($name)] = $name;
} }
return self::$built_in_methods[$lowerClass]; return self::class::$built_in_methods[$lowerClass];
} }
/** /**
@ -280,10 +280,10 @@ trait CustomMethods
// Merge with extra_methods // Merge with extra_methods
$lowerClass = strtolower($class); $lowerClass = strtolower($class);
if (isset(self::$extra_methods[$lowerClass])) { if (isset(self::class::$extra_methods[$lowerClass])) {
self::$extra_methods[$lowerClass] = array_merge(self::$extra_methods[$lowerClass], $newMethods); self::class::$extra_methods[$lowerClass] = array_merge(self::class::$extra_methods[$lowerClass], $newMethods);
} else { } else {
self::$extra_methods[$lowerClass] = $newMethods; self::class::$extra_methods[$lowerClass] = $newMethods;
} }
} }
@ -305,17 +305,17 @@ trait CustomMethods
} }
$lowerClass = strtolower($class); $lowerClass = strtolower($class);
if (!isset(self::$extra_methods[$lowerClass])) { if (!isset(self::class::$extra_methods[$lowerClass])) {
return; return;
} }
$methods = $this->findMethodsFrom($extension); $methods = $this->findMethodsFrom($extension);
// Unset by key // Unset by key
self::$extra_methods[$lowerClass] = array_diff_key(self::$extra_methods[$lowerClass], $methods); self::class::$extra_methods[$lowerClass] = array_diff_key(self::class::$extra_methods[$lowerClass], $methods);
// Clear empty list // Clear empty list
if (empty(self::$extra_methods[$lowerClass])) { if (empty(self::class::$extra_methods[$lowerClass])) {
unset(self::$extra_methods[$lowerClass]); unset(self::class::$extra_methods[$lowerClass]);
} }
} }
@ -328,7 +328,7 @@ trait CustomMethods
*/ */
protected function addWrapperMethod($method, $wrap) protected function addWrapperMethod($method, $wrap)
{ {
self::$extra_methods[strtolower(static::class)][strtolower($method)] = [ self::class::$extra_methods[strtolower(static::class)][strtolower($method)] = [
'wrap' => $wrap, 'wrap' => $wrap,
'method' => $method 'method' => $method
]; ];
@ -343,7 +343,7 @@ trait CustomMethods
*/ */
protected function addCallbackMethod($method, $callback) protected function addCallbackMethod($method, $callback)
{ {
self::$extra_methods[strtolower(static::class)][strtolower($method)] = [ self::class::$extra_methods[strtolower(static::class)][strtolower($method)] = [
'callback' => $callback, 'callback' => $callback,
]; ];
} }

8
src/Core/Extensible.php
View File

@ -191,7 +191,7 @@ trait Extensible
$subclasses = ClassInfo::subclassesFor($class); $subclasses = ClassInfo::subclassesFor($class);
$subclasses[] = $class; $subclasses[] = $class;
foreach ($subclasses as $subclass) { foreach ($subclasses as $subclass) {
unset(self::$extra_methods[strtolower($subclass)]); unset(self::class::$extra_methods[strtolower($subclass)]);
} }
Config::modify() Config::modify()
@ -248,7 +248,7 @@ trait Extensible
$subclasses = ClassInfo::subclassesFor($class); $subclasses = ClassInfo::subclassesFor($class);
$subclasses[] = $class; $subclasses[] = $class;
foreach ($subclasses as $subclass) { foreach ($subclasses as $subclass) {
unset(self::$extra_methods[strtolower($subclass)]); unset(self::class::$extra_methods[strtolower($subclass)]);
} }
} }
@ -300,7 +300,7 @@ trait Extensible
} }
// If this class is unextendable, NOP // If this class is unextendable, NOP
if (in_array($class, self::$unextendable_classes)) { if (in_array($class, self::class::$unextendable_classes)) {
return null; return null;
} }
@ -364,7 +364,7 @@ trait Extensible
} }
$requiredExtension = Extension::get_classname_without_arguments($requiredExtension); $requiredExtension = Extension::get_classname_without_arguments($requiredExtension);
$extensions = self::get_extensions($class); $extensions = self::class::get_extensions($class);
foreach ($extensions as $extension) { foreach ($extensions as $extension) {
if (strcasecmp($extension ?? '', $requiredExtension ?? '') === 0) { if (strcasecmp($extension ?? '', $requiredExtension ?? '') === 0) {
return true; return true;

17
tests/php/Security/RememberLoginHashTest.php
View File

@ -110,20 +110,25 @@ class RememberLoginHashTest extends SapphireTest
$member = $this->objFromFixture(Member::class, 'main'); $member = $this->objFromFixture(Member::class, 'main');
RememberLoginHash::config()->set('replace_token_during_session_renewal', $replaceToken); Deprecation::withNoReplacement(
fn() => RememberLoginHash::config()->set('replace_token_during_session_renewal', $replaceToken)
);
$hash = RememberLoginHash::generate($member); $hash = RememberLoginHash::generate($member);
$oldToken = $hash->getToken(); $oldToken = $hash->getToken();
$oldHash = $hash->Hash; $oldHash = $hash->Hash;
Deprecation::withNoReplacement(fn() => $hash->renew()); // Fetch the token from the DB - otherwise we still have the token from when this was originally created
$storedHash = RememberLoginHash::get()->find('ID', $hash->ID);
Deprecation::withNoReplacement(fn() => $storedHash->renew());
if ($replaceToken) { if ($replaceToken) {
$this->assertNotEquals($oldToken, $hash->getToken()); $this->assertNotEquals($oldToken, $storedHash->getToken());
$this->assertNotEquals($oldHash, $hash->Hash); $this->assertNotEquals($oldHash, $storedHash->Hash);
} else { } else {
$this->assertEmpty($hash->getToken()); $this->assertEmpty($storedHash->getToken());
$this->assertEquals($oldHash, $hash->Hash); $this->assertEquals($oldHash, $storedHash->Hash);
} }
} }