Merge branch '5' into 6

MNT Fix unit test

src/Core/Extensible.php

@@ -511,7 +511,7 @@ trait Extensible
         // Setup all extension instances for this instance
         $this->extension_instances = [];
         foreach (ClassInfo::ancestry(static::class) as $class) {
-            if (in_array($class, self::$unextendable_classes)) {
+            if (in_array($class, self::class::$unextendable_classes)) {
                 continue;
             }
             $extensions = Config::inst()->get($class, 'extensions', Config::UNINHERITED | Config::EXCLUDE_EXTRA_SOURCES);

src/Dev/Deprecation.php

@@ -391,7 +391,7 @@ class Deprecation
                 }
 
                 // Getting a backtrace is slow, so we only do it if we need it
-                $backtrace = null;
+                $backtrace = [];
 
                 // Get the calling scope
                 if ($scope == Deprecation::SCOPE_METHOD) {

tests/php/Dev/DeprecationTest.php

@@ -111,8 +111,8 @@ class DeprecationTest extends SapphireTest
             'Will be removed without equivalent functionality to replace it.',
             'Called from SilverStripe\Dev\Tests\DeprecationTest->testNoticeNoReplacement.'
         ]);
-        $this->expectDeprecation();
-        $this->expectDeprecationMessage($message);
+        $this->expectException(DeprecationTestException::class);
+        $this->expectExceptionMessage($message);
         $this->enableDeprecationNotices(true);
         $ret = $this->myDeprecatedMethodNoReplacement();
         $this->assertSame('abc', $ret);

tests/php/Security/VersionedMemberAuthenticatorTest.php

@@ -32,6 +32,14 @@ class VersionedMemberAuthenticatorTest extends SapphireTest
 
         // Remove password validation
         Member::set_password_validator(null);
+
+        // Explicity add the Versioned extension to Member, even though it's already in $required_extensions.
+        // This is done to call `unset(self::class::$extra_methods[strtolower($subclass)]);` in
+        // Extensible::add_extension() so when CustomMethods::getExtraMethodConfig() updates the $extra_methods
+        // it will include methods of Versioned such as publishSingle()
+        // This issue will only occur when running subsequent unit test classes in the same process, rather than this
+        // this unit test class in isolation
+        Member::add_extension(Versioned::class);
     }
 
     protected function tearDown(): void