From 4c6c0cbdb1a816b36de8ce02449b99524e003111 Mon Sep 17 00:00:00 2001
From: Mojmir Fendek <mfendek@silverstripe.com>
Date: Fri, 22 Dec 2023 11:45:40 +1300
Subject: [PATCH] Fixes.

---
 tests/php/Form/GridField/RichFilterHeaderTest.php      | 10 +++++-----
 .../GridField/RichFilterHeaderTest/Cheerleader.php     |  6 ++++--
 .../GridField/RichFilterHeaderTest/CheerleaderHat.php  |  5 +++--
 tests/php/Form/GridField/RichFilterHeaderTest/Team.php |  5 +++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/php/Form/GridField/RichFilterHeaderTest.php b/tests/php/Form/GridField/RichFilterHeaderTest.php
index 4a9f20e..1aad5b9 100644
--- a/tests/php/Form/GridField/RichFilterHeaderTest.php
+++ b/tests/php/Form/GridField/RichFilterHeaderTest.php
@@ -76,7 +76,7 @@ public function testRenderFilteredHeaderStandard(): void
         $component = $config->getComponentByType(RichFilterHeader::class);
         $htmlFragment = $component->getHTMLFragments($gridField);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<input type="text" name="filter[testfield][City]"'
             . ' class="text grid-field__sort-field no-change-track form-group--no-label"'
             . ' id="Form_mockform_filter_testfield_City" placeholder="Filter by City" />',
@@ -99,7 +99,7 @@ public function testRenderFilterHeaderWithCustomFields(): void
 
         $htmlFragment = $component->getHTMLFragments($gridField);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<select name="filter[testfield][Name]" '
             . 'class="dropdown grid-field__sort-field no-change-track form-group--no-label"'
             . ' id="Form_mockform_filter_testfield_Name" placeholder="Filter by Name">',
@@ -107,7 +107,7 @@ public function testRenderFilterHeaderWithCustomFields(): void
             'We expect a rendered Name filter'
         );
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<select name="filter[testfield][City]" '
             . 'class="dropdown grid-field__sort-field no-change-track form-group--no-label"'
             . ' id="Form_mockform_filter_testfield_City" placeholder="Filter by City">',
@@ -141,7 +141,7 @@ public function testRenderFilterHeaderWithFullConfig(): void
 
         $htmlFragment = $component->getHTMLFragments($gridField);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<select name="filter[testfield][Name]" '
             . 'class="dropdown grid-field__sort-field no-change-track form-group--no-label"'
             . ' id="Form_mockform_filter_testfield_Name" placeholder="Filter by Name">',
@@ -149,7 +149,7 @@ public function testRenderFilterHeaderWithFullConfig(): void
             'We expect a rendered Name filter'
         );
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<select name="filter[testfield][City]" '
             . 'class="dropdown grid-field__sort-field no-change-track form-group--no-label"'
             . ' id="Form_mockform_filter_testfield_City" placeholder="Filter by City">',
diff --git a/tests/php/Form/GridField/RichFilterHeaderTest/Cheerleader.php b/tests/php/Form/GridField/RichFilterHeaderTest/Cheerleader.php
index 0c22f7a..47618ba 100644
--- a/tests/php/Form/GridField/RichFilterHeaderTest/Cheerleader.php
+++ b/tests/php/Form/GridField/RichFilterHeaderTest/Cheerleader.php
@@ -4,10 +4,12 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\HasManyList;
 
 /**
- * Class Cheerleader
- * @package Terraformers\RichFilterHeader\Tests\Form\GridField\RichFilterHeaderTest
+ * @property string $Name
+ * @method Team Team()
+ * @method HasManyList|CheerleaderHat[] Hats()
  */
 class Cheerleader extends DataObject implements TestOnly
 {
diff --git a/tests/php/Form/GridField/RichFilterHeaderTest/CheerleaderHat.php b/tests/php/Form/GridField/RichFilterHeaderTest/CheerleaderHat.php
index 3f1751c..3aa5a3f 100644
--- a/tests/php/Form/GridField/RichFilterHeaderTest/CheerleaderHat.php
+++ b/tests/php/Form/GridField/RichFilterHeaderTest/CheerleaderHat.php
@@ -4,10 +4,11 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\ManyManyList;
 
 /**
- * Class CheerleaderHat
- * @package Terraformers\RichFilterHeader\Tests\Form\GridField\RichFilterHeaderTest
+ * @property string $Colour
+ * @method ManyManyList|Cheerleader[] Cheerleaders()
  */
 class CheerleaderHat extends DataObject implements TestOnly
 {
diff --git a/tests/php/Form/GridField/RichFilterHeaderTest/Team.php b/tests/php/Form/GridField/RichFilterHeaderTest/Team.php
index 165562c..3e589b1 100644
--- a/tests/php/Form/GridField/RichFilterHeaderTest/Team.php
+++ b/tests/php/Form/GridField/RichFilterHeaderTest/Team.php
@@ -6,8 +6,9 @@
 use SilverStripe\ORM\DataObject;
 
 /**
- * Class Team
- * @package Terraformers\RichFilterHeader\Tests\Form\GridField\RichFilterHeaderTest
+ * @property string $Name
+ * @property string $City
+ * @method Cheerleader Cheerleader()
  */
 class Team extends DataObject implements TestOnly
 {