chore(deps): update phpunit to 10.4.2

BacLuc · Dec 2, 2023 · 81b2e5a · 81b2e5a
1 parent ee6a3ce
commit 81b2e5a
Show file tree

Hide file tree

Showing 29 changed files with 403 additions and 503 deletions.
diff --git a/api/.gitignore b/api/.gitignore
@@ -26,6 +26,5 @@
 ###< lexik/jwt-authentication-bundle ###
 
 ###> phpunit/phpunit ###
-/phpunit.xml
-.phpunit.result.cache
+.phpunit.cache
 ###< phpunit/phpunit ###
diff --git a/api/composer.json b/api/composer.json
@@ -53,9 +53,9 @@
         "justinrainbow/json-schema": "5.2.13",
         "php-coveralls/php-coveralls": "2.7.0",
         "phpstan/phpstan": "1.10.46",
-        "phpunit/phpunit": "9.6.13",
+        "phpunit/phpunit": "10.4.2",
         "rector/rector": "0.18.10",
-        "spatie/phpunit-snapshot-assertions": "4.2.16",
+        "spatie/phpunit-snapshot-assertions": "5.1.3",
         "symfony/browser-kit": "6.4.0",
         "symfony/css-selector": "6.4.0",
         "symfony/debug-bundle": "6.4.0",

diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/phpunit.nodocker.xml b/api/phpunit.nodocker.xml
@@ -2,22 +2,25 @@
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="tests/bootstrap.php"
+         cacheDirectory=".phpunit.cache"
 >
     <php>
-        <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" force="true" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-        <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="9.5.10" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="quiet[]=indirect&amp;max[total]=999999"/>
-        <!-- if "Other deprecation notices" ever gets annoying: 
-          <env name="SYMFONY_DEPRECATIONS_HELPER" value="quiet[]=indirect&amp;quiet[]=other&amp;max[total]=999999"/> -->
+        <ini name="display_errors" value="1"/>
+        <ini name="error_reporting" value="-1"/>
+        <server name="APP_ENV" value="test" force="true"/>
+        <server name="SHELL_VERBOSITY" value="-1"/>
+        <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
+        <server name="SYMFONY_PHPUNIT_VERSION" value="10.4.2"/>
         <env name="DATABASE_URL" value="postgresql://ecamp3:ecamp3@localhost:5432/ecamp3dev?serverVersion=15%26charset=utf8" force="true" />
         <env name="TEST_DATABASE_URL" value="postgresql://ecamp3:ecamp3@localhost:5432/ecamp3dev?serverVersion=15%26charset=utf8" force="true" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="quiet[]=indirect&amp;max[total]=999999"/>
+        <!-- if "Other deprecation notices" ever gets annoying: 
+              <env name="SYMFONY_DEPRECATIONS_HELPER"
+            value="quiet[]=indirect&amp;quiet[]=other&amp;max[total]=999999"/> -->
     </php>
 
     <testsuites>
@@ -26,25 +29,20 @@
         </testsuite>
     </testsuites>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-
+    <coverage>
         <report>
             <clover outputFile="build/logs/clover.xml"/>
         </report>
-
     </coverage>
-
     <!-- Run `composer require symfony/panther` before enabling this extension -->
     <!--
-    <extensions>
-        <extension class="Symfony\Component\Panther\ServerExtension" />
-    </extensions>
-    -->
+      <extensions>
+          <extension class="Symfony\Component\Panther\ServerExtension" />
+      </extensions>
+      -->
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/api/phpunit.xml.dist b/api/phpunit.xml.dist
@@ -2,50 +2,45 @@
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
     backupGlobals="false"
     colors="true"
     bootstrap="tests/bootstrap.php"
-    convertDeprecationsToExceptions="false"
+    cacheDirectory=".phpunit.cache"
 >
-    <php>
-        <ini name="display_errors" value="1" />
-        <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" force="true" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-        <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="9.6.13" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="quiet[]=indirect&amp;max[total]=999999" />
-        <!-- if "Other deprecation notices" ever gets annoying: 
+  <php>
+    <ini name="display_errors" value="1"/>
+    <ini name="error_reporting" value="-1"/>
+    <server name="APP_ENV" value="test" force="true"/>
+    <server name="SHELL_VERBOSITY" value="-1"/>
+    <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
+    <server name="SYMFONY_PHPUNIT_VERSION" value="10.4.2"/>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="quiet[]=indirect&amp;max[total]=999999"/>
+    <!-- if "Other deprecation notices" ever gets annoying: 
           <env name="SYMFONY_DEPRECATIONS_HELPER"
         value="quiet[]=indirect&amp;quiet[]=other&amp;max[total]=999999"/> -->
-    </php>
+  </php>
 
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
+  <testsuites>
+    <testsuite name="Project Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-
-        <report>
-            <clover outputFile="build/logs/clover.xml" />
-        </report>
-
-    </coverage>
-
-    <!-- Run `composer require symfony/panther` before enabling this extension -->
-    <!--
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <!-- Run `composer require symfony/panther` before enabling this extension -->
+  <!--
     <extensions>
         <extension class="Symfony\Component\Panther\ServerExtension" />
     </extensions>
     -->
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/api/symfony.lock b/api/symfony.lock
@@ -449,9 +449,6 @@
     "sebastian/recursion-context": {
         "version": "4.0.4"
     },
-    "sebastian/resource-operations": {
-        "version": "3.0.3"
-    },
     "sebastian/type": {
         "version": "2.3.4"
     },

diff --git a/api/tests/Api/CampCollaborations/UpdateCampCollaborationTest.php b/api/tests/Api/CampCollaborations/UpdateCampCollaborationTest.php
@@ -5,6 +5,7 @@
 use App\Entity\CampCollaboration;
 use App\Entity\User;
 use App\Tests\Api\ECampApiTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @internal
@@ -264,9 +265,7 @@ public function testPatchStatusFromInactiveToInvitedSendsInviteEmail() {
         $this->assertEmailCount(1);
     }
 
-    /**
-     * @dataProvider usersWhichCanEditCampCollaborations
-     */
+    #[DataProvider('usersWhichCanEditCampCollaborations')]
     public function testRejectsPatchStatusFromEstablishedToInactiveIfNoManagerWouldBeInCamp(string $userFixtureName) {
         $campCollaboration = static::$fixtures['campCollaboration1camp2manager'];
 
@@ -295,9 +294,7 @@ public function testRejectsPatchStatusFromEstablishedToInactiveIfNoManagerWouldB
         ]);
     }
 
-    /**
-     * @dataProvider usersWhichCanEditCampCollaborations
-     */
+    #[DataProvider('usersWhichCanEditCampCollaborations')]
     public function testRejectsPatchRoleToMemberIfNoManagerWouldBeInCamp(string $userFixtureName) {
         $campCollaboration = static::$fixtures['campCollaboration1camp2manager'];
 
@@ -326,9 +323,7 @@ public function testRejectsPatchRoleToMemberIfNoManagerWouldBeInCamp(string $use
         ]);
     }
 
-    /**
-     * @dataProvider usersWhichCanEditCampCollaborations
-     */
+    #[DataProvider('usersWhichCanEditCampCollaborations')]
     public function testRejectsPatchRoleToGuestIfNoManagerWouldBeInCamp(string $userFixtureName) {
         $campCollaboration = static::$fixtures['campCollaboration1camp2manager'];
 

diff --git a/api/tests/Api/ContentNodes/CreateContentNodeTestCase.php b/api/tests/Api/ContentNodes/CreateContentNodeTestCase.php
@@ -3,9 +3,11 @@
 namespace App\Tests\Api\ContentNodes;
 
 use App\Entity\ContentNode;
+use App\Entity\ContentNode\ColumnLayout;
 use App\Entity\ContentType;
 use App\Tests\Api\ECampApiTestCase;
 use App\Tests\Constraints\CompatibleHalResponse;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
@@ -89,9 +91,7 @@ public function testCreateIsAllowedForManager() {
         $this->assertJsonContains($this->getExampleReadPayload($newContentNode), true);
     }
 
-    /**
-     * @dataProvider getContentNodesWhichCannotHaveChildren
-     */
+    #[DataProvider('getContentNodesWhichCannotHaveChildren')]
     public function testCreateRejectsParentsWhichDontSupportChildren(string $idOfParentFixture) {
         $this->defaultParent = static::$fixtures[$idOfParentFixture];
 
@@ -110,7 +110,7 @@ public function testCreateRejectsParentsWhichDontSupportChildren(string $idOfPar
     public function testCreateValidatesIncompatibleContentType() {
         // given
         /** @var ContentType $contentType */
-        $contentType = static::$fixtures[ContentNode\ColumnLayout::class === $this->entityClass ? 'contentTypeSafetyConcept' : 'contentTypeColumnLayout'];
+        $contentType = static::$fixtures[ColumnLayout::class === $this->entityClass ? 'contentTypeSafetyConcept' : 'contentTypeColumnLayout'];
 
         // when
         $this->create($this->getExampleWritePayload(['contentType' => $this->getIriFor($contentType)]));
@@ -254,6 +254,23 @@ public function testCreateResponseStructureMatchesReadResponseStructure() {
         assertThat($createArray, CompatibleHalResponse::isHalCompatibleWith($getItemResponse->toArray()));
     }
 
+    public static function getContentNodesWhichCannotHaveChildren(): array {
+        return [
+            ContentNode\MaterialNode::class => [
+                'materialNode1',
+            ],
+            ContentNode\MultiSelect::class => [
+                'multiSelect1',
+            ],
+            ContentNode\SingleText::class => [
+                'singleText1',
+            ],
+            ContentNode\StoryBoard::class => [
+                'storyboard1',
+            ],
+        ];
+    }
+
     protected function getExampleWritePayload($attributes = [], $except = []) {
         return parent::getExampleWritePayload(
             array_merge([
@@ -297,21 +314,4 @@ protected function getExampleReadPayload(ContentNode $self, array $attributes =
             ],
         ];
     }
-
-    private static function getContentNodesWhichCannotHaveChildren(): array {
-        return [
-            ContentNode\MaterialNode::class => [
-                'materialNode1',
-            ],
-            ContentNode\MultiSelect::class => [
-                'multiSelect1',
-            ],
-            ContentNode\SingleText::class => [
-                'singleText1',
-            ],
-            ContentNode\StoryBoard::class => [
-                'storyboard1',
-            ],
-        ];
-    }
 }
diff --git a/api/tests/Api/ContentNodes/UpdateContentNodeTestCase.php b/api/tests/Api/ContentNodes/UpdateContentNodeTestCase.php
@@ -5,6 +5,7 @@
 use App\Entity\ContentNode;
 use App\Entity\ContentNode\ColumnLayout;
 use App\Tests\Api\ECampApiTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Base UPDATE (patch) test case to be used for various ContentNode types.
@@ -57,9 +58,7 @@ public function testPatchIsAllowedForManager() {
         $this->assertResponseStatusCodeSame(200);
     }
 
-    /**
-     * @dataProvider getContentNodesWhichCannotHaveChildren
-     */
+    #[DataProvider('getContentNodesWhichCannotHaveChildren')]
     public function testPatchRejectsParentsWhichDontSupportChildren(string $idOfParentFixture) {
         $parentIri = static::getIriFor($idOfParentFixture);
 
@@ -169,7 +168,7 @@ public function testPatchCleansTextOfInstanceName() {
         ]);
     }
 
-    private static function getContentNodesWhichCannotHaveChildren(): array {
+    public static function getContentNodesWhichCannotHaveChildren(): array {
         return [
             ContentNode\MaterialNode::class => [
                 'materialNode1',

diff --git a/api/tests/Api/Invitations/AcceptInvitationTest.php b/api/tests/Api/Invitations/AcceptInvitationTest.php
@@ -5,6 +5,7 @@
 use App\DTO\Invitation;
 use App\Entity\CampCollaboration;
 use App\Tests\Api\ECampApiTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
@@ -157,13 +158,12 @@ public function testAcceptInvitationFailsWhenUserAlreadyInCampAndUserIsAttachedT
     }
 
     /**
-     * @dataProvider invalidMethods
-     *
      * @throws ClientExceptionInterface
      * @throws RedirectionExceptionInterface
      * @throws ServerExceptionInterface
      * @throws TransportExceptionInterface
      */
+    #[DataProvider('invalidMethods')]
     public function testInvalidRequestWhenWrongMethod(string $method) {
         /** @var CampCollaboration $campCollaboration */
         $campCollaboration = static::$fixtures['campCollaboration2invitedCampUnrelated'];

diff --git a/api/tests/Api/Invitations/RejectInvitationTest.php b/api/tests/Api/Invitations/RejectInvitationTest.php
@@ -5,6 +5,7 @@
 use App\DTO\Invitation;
 use App\Entity\CampCollaboration;
 use App\Tests\Api\ECampApiTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
@@ -162,13 +163,12 @@ public function testRejectInvitationSucceedsWhenUserAlreadyInCamp() {
     }
 
     /**
-     * @dataProvider invalidMethods
-     *
      * @throws ClientExceptionInterface
      * @throws RedirectionExceptionInterface
      * @throws ServerExceptionInterface
      * @throws TransportExceptionInterface
      */
+    #[DataProvider('invalidMethods')]
     public function testInvalidRequestWhenWrongMethod(string $method) {
         /** @var CampCollaboration $campCollaboration */
         $campCollaboration = static::$fixtures['campCollaboration2invitedCampUnrelated'];

diff --git a/api/tests/Api/Profiles/UpdateProfileTest.php b/api/tests/Api/Profiles/UpdateProfileTest.php
@@ -4,6 +4,7 @@
 
 use App\Entity\Profile;
 use App\Tests\Api\ECampApiTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @internal
@@ -240,9 +241,7 @@ public function testPatchProfileDoesNotAllowPatchingUser() {
         ]);
     }
 
-    /**
-     * @dataProvider notWriteableProfileProperties
-     */
+    #[DataProvider('notWriteableProfileProperties')]
     public function testNotWriteableProperties(string $property) {
         $user = static::$fixtures['profile1manager'];
         static::createClientWithCredentials()->request(