DEP Use PHPUnit 11

silverstripe · Sep 6, 2024 · d06437c · d06437c
1 parent 7fa4a1b
commit d06437c
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 31 deletions.
diff --git a/tests/php/Conversion/FileConversionManagerTest.php b/tests/php/Conversion/FileConversionManagerTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void
         }
     }
 
-    public function provideConvert(): array
+    public static function provideConvert(): array
     {
         return [
             'supported by image converter' => [

diff --git a/tests/php/Conversion/InterventionImageFileConverterTest.php b/tests/php/Conversion/InterventionImageFileConverterTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
         }
     }
 
-    public function provideSupportsConversion(): array
+    public static function provideSupportsConversion(): array
     {
         // We don't need to check every possible file type here.
         // We're just validating that the logic overall holds true.
@@ -99,7 +99,7 @@ public function testSupportsConversion(string $from, string $to, array $options,
         $this->assertSame($expected, $converter->supportsConversion($from, $to, $options));
     }
 
-    public function provideConvert(): array
+    public static function provideConvert(): array
     {
         return [
             'no options' => [
@@ -133,7 +133,7 @@ public function testConvert(array $options): void
         }
     }
 
-    public function provideConvertUnsupported(): array
+    public static function provideConvertUnsupported(): array
     {
         return [
             'nothing to convert from' => [

diff --git a/tests/php/FileNameFilterTest.php b/tests/php/FileNameFilterTest.php
@@ -80,7 +80,7 @@ public function testFilterWithEmptyString($name)
         );
     }
 
-    public function providerFilterWithEmptyString()
+    public static function providerFilterWithEmptyString()
     {
         return [['ö ö ö.jpg'], ['新しいファイル.jpg']];
     }

diff --git a/tests/php/FileTest.php b/tests/php/FileTest.php
@@ -185,7 +185,7 @@ public function testInvalidImageManipulations()
         $this->assertNull($broken->Pad(100, 100));
     }
 
-    public function appCategoryDataProvider()
+    public static function appCategoryDataProvider()
     {
         return [
             ['image', 'jpg'],
@@ -846,7 +846,7 @@ public function testGetAllowedExtensions($allowedExtensions, $expected)
     /**
      * @return array[]
      */
-    public function allowedExtensionsProvider()
+    public static function allowedExtensionsProvider()
     {
         return [
             'unkeyed array' => [
@@ -1047,7 +1047,7 @@ public function testCanEditFallsBackToCheckingDefaultFilePermissions()
      * @return Generator
      * @see testHasRestrictedAccess
      */
-    public function restrictedAccessDataProvider()
+    public static function restrictedAccessDataProvider()
     {
         yield ['restricted-test-r', false];
         yield ['restricted-test-r1', false];

diff --git a/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php b/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php
@@ -65,7 +65,7 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
-    public function fileList()
+    public static function fileList()
     {
         return [
             ['root-file'],
@@ -76,7 +76,7 @@ public function fileList()
         ];
     }
 
-    public function fileHelperList()
+    public static function fileHelperList()
     {
         $files = $this->fileList();
         $list = [];
@@ -301,7 +301,7 @@ public function testResolveMissingFileID($fixtureID)
         $this->assertNull($redirect, 'Theres no file on our adapter for resolveFileID to find');
     }
 
-    public function searchTupleStrategyVariation()
+    public static function searchTupleStrategyVariation()
     {
         $expected = 'expected/abcdef7890/file.txt';
 
@@ -466,7 +466,7 @@ public function testHashlessSearchForTuple()
         $this->assertEquals($hash, $respPfID->getHash(), 'hash should have been read from main file');
     }
 
-    public function findVariantsStrategyVariation()
+    public static function findVariantsStrategyVariation()
     {
         $brokenHelper = new BrokenFileIDHelper('nonsense.txt', 'nonsense', '', 'nonsense.txt', false, '');
         $mockHelper = new MockFileIDHelper(
@@ -599,7 +599,7 @@ public function testParseFileID()
         $this->assertEmpty($parsedFileID);
     }
 
-    public function listVariantwihtoutFileID()
+    public static function listVariantwihtoutFileID()
     {
         $content = "The quick brown fox jumps over the lazy dog.";
         $hash = sha1($content ?? '');
@@ -640,7 +640,7 @@ public function testGenerateVariantFileID($mainFilePath, $content, ParsedFileID
         }
     }
 
-    public function listVariantParsedFiledID()
+    public static function listVariantParsedFiledID()
     {
         $pfid = new ParsedFileID('folder/file.txt', 'abcdef7890');
         $ambigious = new ParsedFileID('decade1980/file.txt', 'abcdef7890');

diff --git a/tests/php/FilenameParsing/HashFileIDHelperTest.php b/tests/php/FilenameParsing/HashFileIDHelperTest.php
@@ -177,7 +177,7 @@ public function testHashlessBuildFileID()
         $this->getHelper()->buildFileID('Filename.txt', '');
     }
 
-    public function provideRewriteExtension()
+    public static function provideRewriteExtension()
     {
         $jpgToPng = 'ExtRewrite' . Convert::base64url_encode(['jpg', 'png']);
 

diff --git a/tests/php/Flysystem/FlysystemAssetStoreTest.php b/tests/php/Flysystem/FlysystemAssetStoreTest.php
@@ -120,7 +120,7 @@ public function testGetAsUrlWithGrant($grant)
     /**
      * @return array[]
      */
-    public function protectedUrlGrantProvider()
+    public static function protectedUrlGrantProvider()
     {
         return [
             [true],

diff --git a/tests/php/ImageManipulationTest.php b/tests/php/ImageManipulationTest.php
@@ -285,7 +285,7 @@ public function testAttributesHTML()
         );
     }
 
-    public function lazyLoadProvider()
+    public static function lazyLoadProvider()
     {
         return [
             'false (bool)' => [false, false],
@@ -324,7 +324,7 @@ public function testLazyLoad($val, bool $expected)
         );
     }
 
-    public function lazyLoadBadProvider()
+    public static function lazyLoadBadProvider()
     {
         return [
             'null' => [null],
@@ -390,7 +390,7 @@ public function testLazyLoadIsAccessibleInExtensions()
         Image::remove_extension(LazyLoadAccessorExtension::class);
     }
 
-    public function renderProvider()
+    public static function renderProvider()
     {
         $alt = 'This is a image Title';
         $src = '/assets/ImageTest/folder/test-image.png';
@@ -563,7 +563,7 @@ function (AssetStore $store, string $filename, string $hash, string $variant) {
         $this->assertSame('Any content will do - csv is just a text file afterall', $manipulated->getString());
     }
 
-    public function provideConvert(): array
+    public static function provideConvert(): array
     {
         return [
             'supported conversion' => [
@@ -606,7 +606,7 @@ public function testConvert(string $originalFileFixtureClass, string $originalFi
         }
     }
 
-    public function provideConvertChainWithLazyLoad(): array
+    public static function provideConvertChainWithLazyLoad(): array
     {
         return [
             [true],

diff --git a/tests/php/ImageTest.php b/tests/php/ImageTest.php
@@ -346,7 +346,7 @@ public function testImageResizeInvalid($width, $height, $error)
         $image->Pad($width, $height);
     }
 
-    public function providerTestImageResizeInvalid()
+    public static function providerTestImageResizeInvalid()
     {
         return [
             ['-1', 100, 'Width must be positive'],

diff --git a/tests/php/ProtectedFileControllerTest.php b/tests/php/ProtectedFileControllerTest.php
@@ -63,7 +63,7 @@ public function testIsValidFilename($name, $isValid)
         );
     }
 
-    public function getFilenames()
+    public static function getFilenames()
     {
         return [
             // Valid names

diff --git a/tests/php/PublicAssetAdapterTest.php b/tests/php/PublicAssetAdapterTest.php
@@ -29,7 +29,7 @@ public function testInitBaseURL()
         );
     }
 
-    public function provideGetPublicUrl(): array
+    public static function provideGetPublicUrl(): array
     {
         return [
             'filename' => [

diff --git a/tests/php/RedirectFileControllerTest.php b/tests/php/RedirectFileControllerTest.php
@@ -60,7 +60,7 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
-    public function fileList()
+    public static function fileList()
     {
         return [
             'root file' => ['asdf'],
@@ -349,7 +349,7 @@ public function testRedirectAfterDeleting($fixtureID)
         );
     }
 
-    public function imageList()
+    public static function imageList()
     {
         return [
             ['', 'test', 'jpg'],

diff --git a/tests/php/Shortcodes/ImageShortcodeProviderTest.php b/tests/php/Shortcodes/ImageShortcodeProviderTest.php
@@ -471,7 +471,7 @@ public function testWhiteIsConfigurable()
         );
     }
 
-    public function gettersAndSettersProvider(): array
+    public static function gettersAndSettersProvider(): array
     {
         return [
                     'image without special characters' => [

diff --git a/tests/php/Storage/AssetStoreTest.php b/tests/php/Storage/AssetStoreTest.php
@@ -235,7 +235,7 @@ public function testConflictResolution()
      *
      * @return array
      */
-    public function dataProviderFileIDs()
+    public static function dataProviderFileIDs()
     {
         return [
             [
@@ -579,7 +579,7 @@ public function testStoreLocationWritingLogic()
         $this->assertFileExists(ASSETS_PATH . '/AssetStoreTest/explicitelyPublicStore__variant.txt');
     }
 
-    public function listOfVariantsToWrite()
+    public static function listOfVariantsToWrite()
     {
         $content = "The quick brown fox jumps over the lazy dog.";
         $hash = sha1($content ?? '');
@@ -629,7 +629,7 @@ public function testVariantWriteNextToFile(
         $this->assertTrue($fs->fileExists($expectedVariantPath));
     }
 
-    public function listOfFilesToNormalise()
+    public static function listOfFilesToNormalise()
     {
         $public = AssetStore::VISIBILITY_PUBLIC;
         $protected = AssetStore::VISIBILITY_PROTECTED;
@@ -728,7 +728,7 @@ public function testNormalise($fsName, array $contents, $filename, $hash, array
         $protectedStrat->setResolutionFileIDHelpers($originalHelpers);
     }
 
-    public function listOfFileIDsToNormalise()
+    public static function listOfFileIDsToNormalise()
     {
         $public = AssetStore::VISIBILITY_PUBLIC;
         $protected = AssetStore::VISIBILITY_PROTECTED;