tec: Upgrade to PHPUnit 10

flusio · Aug 7, 2023 · d53c58d · d53c58d
1 parent dff1ccf
commit d53c58d
Show file tree

Hide file tree

Showing 12 changed files with 248 additions and 372 deletions.
diff --git a/Makefile b/Makefile
@@ -78,7 +78,7 @@ icons-build: ## Build the icons asset
 .PHONY: test
 test: ## Run the test suite
 	$(PHP) ./vendor/bin/phpunit \
-		$(COVERAGE) --whitelist ./src --whitelist ./lib/SpiderBits \
+		$(COVERAGE) --coverage-filter ./src --coverage-filter ./lib/SpiderBits \
 		--bootstrap ./tests/bootstrap.php \
 		--testdox \
 		$(PHPUNIT_FILTER) \

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "phpunit/phpunit": "^9.1",
+        "phpunit/phpunit": "^10.3",
         "squizlabs/php_codesniffer": "^3.5",
         "fakerphp/faker": "^1.17",
         "phpstan/phpstan": "^1.10"

diff --git a/composer.lock b/composer.lock
diff --git a/tests/controllers/OnboardingTest.php b/tests/controllers/OnboardingTest.php
@@ -127,7 +127,7 @@ public function testUpdateLocaleRedirectsIfLocaleIsInvalid(): void
     /**
      * @return array<array{int}>
      */
-    public function validStepsProvider(): array
+    public static function validStepsProvider(): array
     {
         return [
             [1],
@@ -142,7 +142,7 @@ public function validStepsProvider(): array
     /**
      * @return array<array{int}>
      */
-    public function invalidStepsProvider(): array
+    public static function invalidStepsProvider(): array
     {
         $faker = \Faker\Factory::create();
         /** @var int */

diff --git a/tests/controllers/collections/ImagesTest.php b/tests/controllers/collections/ImagesTest.php
@@ -525,7 +525,7 @@ public function testUpdateFailsIfFileFailedToUpload(int $error): void
     /**
      * @return array<array{int}>
      */
-    public function tooLargeErrorsProvider(): array
+    public static function tooLargeErrorsProvider(): array
     {
         return [
             [UPLOAD_ERR_INI_SIZE],
@@ -536,7 +536,7 @@ public function tooLargeErrorsProvider(): array
     /**
      * @return array<array{int}>
      */
-    public function otherFileErrorsProvider(): array
+    public static function otherFileErrorsProvider(): array
     {
         return [
             [UPLOAD_ERR_PARTIAL],

diff --git a/tests/controllers/importations/OpmlTest.php b/tests/controllers/importations/OpmlTest.php
@@ -320,7 +320,7 @@ public function testImportFailsIfIsUploadedFileReturnsFalse(): void
     /**
      * @return array<array{int}>
      */
-    public function tooLargeErrorsProvider(): array
+    public static function tooLargeErrorsProvider(): array
     {
         return [
             [UPLOAD_ERR_INI_SIZE],
@@ -331,7 +331,7 @@ public function tooLargeErrorsProvider(): array
     /**
      * @return array<array{int}>
      */
-    public function otherFileErrorsProvider(): array
+    public static function otherFileErrorsProvider(): array
     {
         return [
             [UPLOAD_ERR_PARTIAL],

diff --git a/tests/controllers/my/AvatarTest.php b/tests/controllers/my/AvatarTest.php
@@ -253,7 +253,7 @@ public function testUpdateFailsIfFileFailedToUpload(int $error): void
     /**
      * @return array<array{int}>
      */
-    public function tooLargeErrorsProvider(): array
+    public static function tooLargeErrorsProvider(): array
     {
         return [
             [UPLOAD_ERR_INI_SIZE],
@@ -264,7 +264,7 @@ public function tooLargeErrorsProvider(): array
     /**
      * @return array<array{int}>
      */
-    public function otherFileErrorsProvider(): array
+    public static function otherFileErrorsProvider(): array
     {
         return [
             [UPLOAD_ERR_PARTIAL],

diff --git a/tests/lib/SpiderBits/ClearUrlsTest.php b/tests/lib/SpiderBits/ClearUrlsTest.php
@@ -17,7 +17,7 @@ public function testClear(string $tracked_url, string $expected_url): void
     /**
      * @return array<array{string, string}>
      */
-    public function clearProvider(): array
+    public static function clearProvider(): array
     {
         return [
             // utm_* parameters in URL query

diff --git a/tests/lib/SpiderBits/UrlTest.php b/tests/lib/SpiderBits/UrlTest.php
@@ -96,7 +96,7 @@ public function testIsValidFailsWithAnInvalidScheme(): void
     /**
      * @return array<array{string, string, string}>
      */
-    public function absolutizeProvider(): array
+    public static function absolutizeProvider(): array
     {
         return [
             ['https://host', '/path', 'https://host/path'],
@@ -134,7 +134,7 @@ public function absolutizeProvider(): array
     /**
      * @return array<array{string, string}>
      */
-    public function sanitizeProvider(): array
+    public static function sanitizeProvider(): array
     {
         // This test suite comes from https://developers.google.com/safe-browsing/v4/urls-hashing#canonicalization
         // Minor differences are indicated in comments
@@ -206,7 +206,7 @@ public function sanitizeProvider(): array
      *     array<string, string|null|array<?string>>
      * }>
      */
-    public function parseAndBuildQueryProvider(): array
+    public static function parseAndBuildQueryProvider(): array
     {
         return [
             [

diff --git a/tests/lib/SpiderBits/feeds/FeedTest.php b/tests/lib/SpiderBits/feeds/FeedTest.php
@@ -447,7 +447,7 @@ public function testIsFeedContentTypeWithInvalidContentTypeReturnsTrue(string $c
     /**
      * @return array<array{string}>
      */
-    public function validContentType(): array
+    public static function validContentType(): array
     {
         return [
             ['application/atom+xml'],
@@ -466,7 +466,7 @@ public function validContentType(): array
     /**
      * @return array<array{string}>
      */
-    public function invalidContentType(): array
+    public static function invalidContentType(): array
     {
         return [
             [''],

diff --git a/tests/models/ImageTest.php b/tests/models/ImageTest.php
@@ -38,7 +38,7 @@ public function testResizeRectangle(array $initial_size, array $destination_size
      *     },
      * }>
      */
-    public function resizeProvider(): array
+    public static function resizeProvider(): array
     {
         return [
             [

diff --git a/tests/utils/LocaleTest.php b/tests/utils/LocaleTest.php
@@ -27,7 +27,7 @@ public function testBestWithFrench(string $accept_language): void
     /**
      * @return array<array{string}>
      */
-    public function englishAcceptLanguage(): array
+    public static function englishAcceptLanguage(): array
     {
         return [
             [''],
@@ -43,7 +43,7 @@ public function englishAcceptLanguage(): array
     /**
      * @return array<array{string}>
      */
-    public function frenchAcceptLanguage(): array
+    public static function frenchAcceptLanguage(): array
     {
         return [
             ['fr'],