Merge pull request #7593 from BacLuc/fix-phpunit-deprecations

Fix some phpunit deprecations

Author: pmattmann

api/phpunit.nodocker.xml

@@ -7,6 +7,11 @@
          colors="true"
          bootstrap="tests/bootstrap.php"
          cacheDirectory=".phpunit.cache"
+         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
 >
     <php>
         <ini name="display_errors" value="1"/>

api/phpunit.xml.dist

@@ -7,6 +7,11 @@
     colors="true"
     bootstrap="tests/bootstrap.php"
     cacheDirectory=".phpunit.cache"
+    displayDetailsOnPhpunitDeprecations="true"
+    displayDetailsOnTestsThatTriggerDeprecations="true"
+    displayDetailsOnTestsThatTriggerErrors="true"
+    displayDetailsOnTestsThatTriggerNotices="true"
+    displayDetailsOnTestsThatTriggerWarnings="true"
 >
   <php>
     <ini name="display_errors" value="1"/>

api/tests/State/ContentNodes/SingleTextPersistProcessorTest.php

@@ -9,30 +9,33 @@
 use App\Entity\ContentNode\SingleText;
 use App\InputFilter\CleanHTMLFilter;
 use App\State\ContentNode\SingleTextPersistProcessor;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 
+use function PHPUnit\Framework\assertThat;
+use function PHPUnit\Framework\equalTo;
+use function PHPUnit\Framework\logicalNot;
+
 /**
  * @internal
  */
 class SingleTextPersistProcessorTest extends TestCase {
     private SingleTextPersistProcessor $processor;
-
-    private CleanHTMLFilter|MockObject $cleanHTMLFilter;
     private ColumnLayout $root;
     private SingleText $contentNode;
 
+    /**
+     * @throws Exception
+     */
     protected function setUp(): void {
         $decoratedProcessor = $this->createMock(ProcessorInterface::class);
-        $this->cleanHTMLFilter = $this->createMock(CleanHTMLFilter::class);
-        $this->cleanHTMLFilter->method('applyTo')->will(
-            $this->returnCallback(
-                function ($object, $property) {
-                    $object[$property] = '***sanitizedHTML***';
+        $cleanHTMLFilter = $this->createMock(CleanHTMLFilter::class);
+        $cleanHTMLFilter->method('applyTo')->willReturnCallback(
+            function ($object, $property) {
+                $object[$property] = '***sanitizedHTML***';
 
-                    return $object;
-                }
-            )
+                return $object;
+            }
         );
 
         $this->contentNode = new SingleText();
@@ -44,33 +47,24 @@ function ($object, $property) {
         $this->contentNode->parent = new SingleText();
         $this->contentNode->parent->root = $this->root;
 
-        $this->processor = new SingleTextPersistProcessor($decoratedProcessor, $this->cleanHTMLFilter);
+        $this->processor = new SingleTextPersistProcessor($decoratedProcessor, $cleanHTMLFilter);
     }
 
     public function testSetsRootFromParentOnCreate() {
-        // when
-        /** @var SingleText $data */
         $data = $this->processor->onBefore($this->contentNode, new Post());
 
-        // then
-        $this->assertEquals($this->root, $data->root);
+        assertThat($this->root, equalTo($data->root));
     }
 
     public function testDoesNotSetRootFromParentOnUpdate() {
-        // when
-        /** @var SingleText $data */
         $data = $this->processor->onBefore($this->contentNode, new Patch());
 
-        // then
-        $this->assertNotEquals($this->root, $data->root);
+        assertThat($this->root, logicalNot(equalTo($data->root)));
     }
 
-    public function testSantizeData() {
-        // when
-        /** @var SingleText $data */
+    public function testSanitizeData() {
         $data = $this->processor->onBefore($this->contentNode, new Post());
 
-        // then
-        $this->assertEquals('***sanitizedHTML***', $data->data['html']);
+        assertThat('***sanitizedHTML***', equalTo($data->data['html']));
     }
 }

api/tests/State/ResendActivationProcessorTest.php

@@ -31,6 +31,8 @@ class ResendActivationProcessorTest extends TestCase {
     private MockObject|UserRepository $userRepository;
     private MailService|MockObject $mailService;
 
+    private ResendActivationProcessor $processor;
+
     /**
      * @throws Exception
      */