Merge pull request silverstripe#1253 from creative-commoners/pulls/6/…

…phpunit11 DEP Use PHPUnit 11
creative-commoners · Sep 18, 2024 · 34d349b · 34d349b
2 parents f2f2fde + 43d199a
commit 34d349b
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 88 deletions.
diff --git a/tests/BaseElementTest.php b/tests/BaseElementTest.php
@@ -22,6 +22,7 @@
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\VersionedAdmin\Forms\HistoryViewerField;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class BaseElementTest extends FunctionalTest
 {
@@ -275,7 +276,7 @@ public function testUpdateContentForSearchIndex()
         ElementContent::remove_extension(TestContentForSearchIndexExtension::class);
     }
 
-    public function getElementAnchorDataProvider(): array
+    public static function getElementAnchorDataProvider(): array
     {
         return [
             [
@@ -296,9 +297,7 @@ public function getElementAnchorDataProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider getElementAnchorDataProvider
-     */
+    #[DataProvider('getElementAnchorDataProvider')]
     public function testGetAnchorsInContent(string $elementClass, string $elementName, array $expectedAnchors): void
     {
         $element = $this->objFromFixture($elementClass, $elementName);
@@ -307,7 +306,7 @@ public function testGetAnchorsInContent(string $elementClass, string $elementNam
         $this->assertSame($expectedAnchors, array_values($element->getAnchorsInContent()));
     }
 
-    public function getElementCMSLinkDataProvider()
+    public static function getElementCMSLinkDataProvider()
     {
         return [
             // Element in DataObject with $directLink === true
@@ -351,9 +350,7 @@ public function getElementCMSLinkDataProvider()
         ];
     }
 
-    /**
-     * @dataProvider getElementCMSLinkDataProvider
-     */
+    #[DataProvider('getElementCMSLinkDataProvider')]
     public function testGetCMSEditLink(string $class, string $element, ?string $link, bool $directLink = false)
     {
         $object = $this->objFromFixture($class, $element);
@@ -366,7 +363,7 @@ public function testGetCMSEditLink(string $class, string $element, ?string $link
         }
     }
 
-    public function canDeleteProvider()
+    public static function canDeleteProvider()
     {
         return [
             // Element on Page
@@ -384,9 +381,7 @@ public function canDeleteProvider()
         ];
     }
 
-    /**
-     * @dataProvider canDeleteProvider
-     */
+    #[DataProvider('canDeleteProvider')]
     public function testCanDelete(
         string $class,
         string $element,
@@ -400,7 +395,7 @@ public function testCanDelete(
         $this->assertTrue($canDelete);
     }
 
-    public function linksProvider()
+    public static function linksProvider()
     {
         return [
             // Element on Page
@@ -418,18 +413,14 @@ public function linksProvider()
         ];
     }
 
-    /**
-     * @dataProvider linksProvider
-     */
+    #[DataProvider('linksProvider')]
     public function testLinkWithDataObject(string $class, string $element, ?string $link)
     {
         $object = $this->objFromFixture($class, $element);
         $this->assertEquals($link, $object->Link());
     }
 
-    /**
-     * @dataProvider linksProvider
-     */
+    #[DataProvider('linksProvider')]
     public function testAbsoluteLink(string $class, string $element, ?string $link)
     {
         $link = $link ? Director::absoluteURL($link) : $link;
@@ -438,7 +429,7 @@ public function testAbsoluteLink(string $class, string $element, ?string $link)
         $this->assertEquals($link, $absoluteLink);
     }
 
-    public function previewLinksProvider()
+    public static function previewLinksProvider()
     {
         return [
             // Element on Page
@@ -474,9 +465,7 @@ public function previewLinksProvider()
         ];
     }
 
-    /**
-     * @dataProvider previewLinksProvider
-     */
+    #[DataProvider('previewLinksProvider')]
     public function testPreviewLink(string $class, string $elementIdentifier, ?string $link)
     {
         /** @var BaseElement $element */

diff --git a/tests/Controllers/ElementSiteTreeFilterSearchTest.php b/tests/Controllers/ElementSiteTreeFilterSearchTest.php
@@ -13,6 +13,7 @@
 use SilverStripe\ORM\DataObjectSchema;
 use DNADesign\Elemental\Models\ElementContent;
 use DNADesign\Elemental\Tests\Src\TestElementContentExtension;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class ElementSiteTreeFilterSearchTest extends SapphireTest
 {
@@ -34,8 +35,8 @@ class ElementSiteTreeFilterSearchTest extends SapphireTest
     /**
      * @param string $searchTerm
      * @param array $expected
-     * @dataProvider searchProvider
      */
+    #[DataProvider('searchProvider')]
     public function testElementalPageDataMatchesInCmsSearch($searchTerm, $expected)
     {
         $filter = CMSSiteTreeFilter_Search::create(['Term' => $searchTerm]);
@@ -47,7 +48,7 @@ public function testElementalPageDataMatchesInCmsSearch($searchTerm, $expected)
     /**
      * @return array[]
      */
-    public function searchProvider()
+    public static function searchProvider()
     {
         return [
             'Nested block data' => ['specifically', [
@@ -63,9 +64,7 @@ public function searchProvider()
         ];
     }
 
-    /**
-     * @dataProvider provideApplyDefaultFilters
-     */
+    #[DataProvider('provideApplyDefaultFilters')]
     public function testApplyDefaultFilters(bool $renderElements, string $term, array $expected): void
     {
         // Set protected method visibility - applyDefaultFilters() is essentially an
@@ -78,57 +77,57 @@ public function testApplyDefaultFilters(bool $renderElements, string $term, arra
         $this->assertSame($expected, $ret->column('Title'));
     }
 
-    public function provideApplyDefaultFilters(): array
+    public static function provideApplyDefaultFilters(): array
     {
 
         return [
             'render_elements true - text search' => [
-                'render_elements' => true,
+                'renderElements' => true,
                 'term' => 'This content is rendered',
                 'expected' => ['Content blocks page']
             ],
             'render_elements true - unrendered search' => [
-                'render_elements' => true,
+                'renderElements' => true,
                 'term' => 'This field is unrendered',
                 'expected' => []
             ],
             'render_elements true - extended search' => [
-                'render_elements' => true,
+                'renderElements' => true,
                 'term' => 'This content is from an extension hook',
                 'expected' => []
             ],
             'render_elements true - int search' => [
-                'render_elements' => true,
+                'renderElements' => true,
                 'term' => '456',
                 'expected' => []
             ],
             'render_elements true - enum search' => [
-                'render_elements' => true,
+                'renderElements' => true,
                 'term' => 'Sunny',
                 'expected' => []
             ],
             'render_elements false - text search' => [
-                'render_elements' => false,
+                'renderElements' => false,
                 'term' => 'This content is rendered',
                 'expected' => ['Content blocks page']
             ],
             'render_elements false - unrendered search' => [
-                'render_elements' => false,
+                'renderElements' => false,
                 'term' => 'This field is unrendered',
                 'expected' => ['Content blocks page']
             ],
             'render_elements false - extended search' => [
-                'render_elements' => false,
+                'renderElements' => false,
                 'term' => 'This content is from an extension hook',
                 'expected' => ['Content blocks page']
             ],
             'render_elements false - int search' => [
-                'render_elements' => false,
+                'renderElements' => false,
                 'term' => '456',
                 'expected' => []
             ],
             'render_elements false - enum search' => [
-                'render_elements' => false,
+                'renderElements' => false,
                 'term' => 'Sunny',
                 'expected' => []
             ],