chore: Upgrade to phpunit10

ankitpokhrel · Feb 17, 2024 · bd39ea0 · bd39ea0
1 parent 3c3e836
commit bd39ea0
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "ext-pcntl": "*",
     "friendsofphp/php-cs-fixer": "^3.0",
     "mockery/mockery": "^1.3.4 || ^1.4.2",
-    "phpunit/phpunit": "^8.5.19 || ^9.4"
+    "phpunit/phpunit": "^8.5.19 || ^10.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         bootstrap="tests/bootstrap.php"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="true">
-    <testsuites>
-        <testsuite name="Unit">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/</directory>
-            <exclude>
-                <directory suffix=".php">./src/Commands</directory>
-                <directory suffix=".php">./src/Config</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="REDIS_HOST" value="127.0.0.1"/>
-        <env name="REDIS_PORT" value="6379"/>
-        <env name="REDIS_TIMEOUT" value="0.5"/>
-        <env name="REDIS_DATABASE" value="15"/>
-    </php>
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+  backupGlobals="false"
+  bootstrap="tests/bootstrap.php"
+  colors="true"
+  processIsolation="false"
+  stopOnFailure="true"
+  cacheDirectory=".phpunit.cache"
+  backupStaticProperties="false"
+>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="REDIS_HOST" value="127.0.0.1"/>
+    <env name="REDIS_PORT" value="6379"/>
+    <env name="REDIS_TIMEOUT" value="0.5"/>
+    <env name="REDIS_DATABASE" value="15"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/Commands</directory>
+      <directory suffix=".php">./src/Config</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/tests/FileTest.php b/tests/FileTest.php
@@ -205,7 +205,7 @@ public function it_throws_404_for_invalid_file(): void
     public function it_throws_exception_for_file_with_no_permission(): void
     {
         $this->expectException(FileException::class);
-        $this->expectErrorMessageMatches('/Unable to open [a-zA-Z0-9-\/.]+/');
+        $this->expectExceptionMessageMatches('/Unable to open [a-zA-Z0-9-\/.]+/');
 
         $file = __DIR__ . '/Fixtures/403.txt';
 
@@ -413,7 +413,7 @@ public function it_deletes_all_files_and_folder(string $path): void
 
         $this->file->delete($files, true);
 
-        $this->assertFileNotExists($path);
+        $this->assertFileDoesNotExist($path);
     }
 
     /**
@@ -460,7 +460,7 @@ public function it_deletes_files_only(): string
         $this->file->delete($files);
 
         foreach ($files as $file) {
-            $this->assertFileNotExists($file);
+            $this->assertFileDoesNotExist($file);
         }
 
         $this->assertFileExists($path);
@@ -496,7 +496,7 @@ public function it_deletes_empty_folder(string $path)
     {
         $this->file->delete(["$path/1"], true);
 
-        $this->assertFileNotExists($path);
+        $this->assertFileDoesNotExist($path);
     }
 
     /**

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -144,7 +144,7 @@ public function it_sends_binary_response(): void
         $response = $this->response->createOnly(true)->download($file, $name);
 
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             "/attachment; filename=($name|\"$name\")/",
             $response->headers->get('content-disposition')
         );
@@ -162,7 +162,7 @@ public function it_sends_binary_response_when_name_is_null(): void
         $response = $this->response->createOnly(true)->download($file, null, [], 'inline');
 
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             '/inline; filename=(empty.txt|"empty.txt")/',
             $response->headers->get('content-disposition')
         );

diff --git a/tests/Tus/ClientTest.php b/tests/Tus/ClientTest.php
@@ -1340,7 +1340,7 @@ public function it_creates_a_partial_resource_with_post_request(): void
         $this->assertEquals('http://tus-server/files/' . $key, $this->tusClientMock->create($key));
     }
 
-    public function createWithUploadDataProvider()
+    public static function createWithUploadDataProvider()
     {
         return [
             [-1],

diff --git a/tests/Tus/ServerTest.php b/tests/Tus/ServerTest.php
@@ -2622,7 +2622,7 @@ public function it_handles_download_request(): void
         $response = $this->tusServerMock->handleGet();
 
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             "/attachment; filename=($fileName|\"$fileName\")/",
             $response->headers->get('content-disposition')
         );