MNT Fix unit tests

silverstripe · Oct 22, 2024 · f5bc934 · f5bc934
1 parent ba97de9
commit f5bc934
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/src/Core/Extensible.php b/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);

diff --git a/src/Dev/Deprecation.php b/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) {

diff --git a/tests/php/Dev/DeprecationTest.php b/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);

diff --git a/tests/php/ORM/Search/SearchContextTest.php b/tests/php/ORM/Search/SearchContextTest.php
@@ -139,16 +139,18 @@ public function testUserDefinedFieldsAppearInSearchContext()
     {
         $company = SearchContextTest\Company::singleton();
         $context = $company->getDefaultSearchContext();
-        $this->assertEquals(
-            new FieldList(
-                new HiddenField($company->getGeneralSearchFieldName(), 'General Search'),
-                (new TextField("Name", 'Name'))
-                    ->setMaxLength(255),
-                new TextareaField("Industry", 'Industry'),
-                new NumericField("AnnualProfit", 'The Almighty Annual Profit')
-            ),
-            $context->getFields()
+        $expected = new FieldList(
+            new HiddenField($company->getGeneralSearchFieldName(), 'General Search'),
+            $fieldA = (new TextField("Name", 'Name'))->setMaxLength(255),
+            $fieldB = new TextareaField("Industry", 'Industry'),
+            $fieldC = new NumericField("AnnualProfit", 'The Almighty Annual Profit')
         );
+        foreach ([$fieldA, $fieldB, $fieldC] as $field) {
+            // Call getExtensionInstances() so that extension_instances is not null
+            // so that it is equivalent to $context-getFields() below
+            $field->getExtensionInstances();
+        }
+        $this->assertEquals($expected, $context->getFields());
     }
 
     public function testRelationshipObjectsLinkedInSearch()