chore: update dependencies (#4012)

* chore: phpunit 10 * chore: config * Apply fixes from StyleCI * chore: phpunit 11 (php 8.2 minimum requirement) * feat: laravel 11 * Apply fixes from StyleCI * feat: carbon v3 * fixes
flarum · Aug 6, 2024 · d645126 · d645126
1 parent 4b94735
commit d645126
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ composer.phar
 
 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant

diff --git a/tests/integration/api/CanRequestCustomTimedStatisticsTest.php b/tests/integration/api/CanRequestCustomTimedStatisticsTest.php
@@ -15,6 +15,7 @@
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Flarum\User\User;
+use PHPUnit\Framework\Attributes\Test;
 
 class CanRequestCustomTimedStatisticsTest extends TestCase
 {
@@ -60,9 +61,7 @@ protected function getDatabaseData(): array
         ];
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function can_request_timed_stats()
     {
         $time = $this->nowTime->copy();

diff --git a/tests/integration/api/CanRequestLifetimeStatisticsTest.php b/tests/integration/api/CanRequestLifetimeStatisticsTest.php
@@ -15,6 +15,7 @@
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Flarum\User\User;
+use PHPUnit\Framework\Attributes\Test;
 
 class CanRequestLifetimeStatisticsTest extends TestCase
 {
@@ -59,9 +60,7 @@ protected function getDatabaseData(): array
         ];
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function can_request_lifetime_stats()
     {
         $response = $this->send(

diff --git a/tests/integration/api/CanRequestTimedStatisticsTest.php b/tests/integration/api/CanRequestTimedStatisticsTest.php
@@ -15,6 +15,7 @@
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Flarum\User\User;
+use PHPUnit\Framework\Attributes\Test;
 
 class CanRequestTimedStatisticsTest extends TestCase
 {
@@ -59,9 +60,7 @@ protected function getDatabaseData(): array
         ];
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function can_request_timed_stats()
     {
         $time = $this->nowTime->copy();

diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     processIsolation="true"
     stopOnFailure="false"
     bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">../src/</directory>
         </include>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="Flarum Integration Tests">
             <directory suffix="Test.php">./integration</directory>

diff --git a/tests/phpunit.unit.xml b/tests/phpunit.unit.xml
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
     bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">../src/</directory>
         </include>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="Flarum Unit Tests">
             <directory suffix="Test.php">./unit</directory>
         </testsuite>
     </testsuites>
-    <listeners>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
-    </listeners>
 </phpunit>