Merge 790faa6260 into ba97de9458

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->expectException(DeprecationTestException::class);
-        $this->expectDeprecationMessage($message);
+        $this->expectExceptionMessage($message);
         $this->enableDeprecationNotices(true);
         $ret = $this->myDeprecatedMethodNoReplacement();
         $this->assertSame('abc', $ret);

tests/php/ORM/Search/SearchContextTest.php

@@ -138,16 +138,36 @@ class SearchContextTest extends SapphireTest
     public function testUserDefinedFieldsAppearInSearchContext()
     {
         $company = SearchContextTest\Company::singleton();
-        $context = $company->getDefaultSearchContext();
+        $searchName = $company->getGeneralSearchFieldName();
-        $this->assertEquals(
+        $expected = new FieldList(
-            new FieldList(
+            new HiddenField($searchName, 'General Search'),
-                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()
+        $context = $company->getDefaultSearchContext();
+        $actual = $context->getFields();
+        $this->assertSame($expected->count(), $actual->count());
+        $this->assertEquals(
+            $expected->fieldByName($searchName)->Title,
+            $actual->fieldByName($searchName)->Title
+        );
+        $this->assertEquals(
+            $expected->fieldByName('Name')->Title,
+            $actual->fieldByName('Name')->Title
+        );
+        $this->assertEquals(
+            $expected->fieldByName('Name')->getMaxLength(),
+            $actual->fieldByName('Name')->getMaxLength()
+        );
+        $this->assertEquals(
+            $expected->fieldByName('Industry')->Title,
+            $actual->fieldByName('Industry')->Title
+        );
+        $this->assertEquals(
+            $expected->fieldByName('AnnualProfit')->Title,
+            $actual->fieldByName('AnnualProfit')->Title
         );
     }