Merge pull request #11432 from creative-commoners/pulls/6/fix-definemethods

MNT Fix unit tests

Author: GuySartorelli

src/Core/Extensible.php

@@ -511,7 +511,7 @@ public function getExtensionInstances()
         // 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 @@ public static function notice($atVersion, $string = '', $scope = Deprecation::SC
                 }
 
                 // 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 @@ public function testNoticeNoReplacement()
             '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);