TASK: Update PhpUnit

Neos.Cache/Tests/Functional/Backend/PdoBackendTest.php

@@ -18,6 +18,8 @@
 use Neos\Cache\EnvironmentConfiguration;
 use Neos\Cache\Tests\BaseTestCase;
 use Neos\Cache\Frontend\FrontendInterface;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Testcase for the PDO cache backend
@@ -33,12 +35,16 @@ class PdoBackendTest extends BaseTestCase
     /**
      * @var PdoBackend[]
      */
-    private $backends = [];
+    private array $backends = [];
 
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|FrontendInterface
-     */
-    private $cache;
+    private FrontendInterface|MockObject $cache;
+
+    protected function setUp(): void
+    {
+        $this->cache = $this->createMock(FrontendInterface::class);
+        $this->cache->method('getIdentifier')->willReturn('TestCache');
+        $this->setupBackends();
+    }
 
     protected function tearDown(): void
     {
@@ -47,49 +53,43 @@ protected function tearDown(): void
         }
     }
 
-    public function backendsToTest(): array
-    {
-        $this->cache = $this->createMock(FrontendInterface::class);
-        $this->cache->method('getIdentifier')->willReturn('TestCache');
-        $this->setupBackends();
-        return $this->backends;
-    }
-
     /**
      * @test
-     * @dataProvider backendsToTest
      */
-    public function setAddsCacheEntry(BackendInterface $backend): void
+    public function setAddsCacheEntry(): void
     {
-        $backend->flush();
+        foreach ($this->backends as $backend) {
+            $backend->flush();
 
-        // use data that contains binary junk
-        $data = random_bytes(2048);
-        $backend->set('some_entry', $data);
-        self::assertEquals($data, $backend->get('some_entry'));
+            // use data that contains binary junk
+            $data = random_bytes(2048);
+            $backend->set('some_entry', $data);
+            self::assertEquals($data, $backend->get('some_entry'));
+        }
     }
 
     /**
      * @test
-     * @dataProvider backendsToTest
      */
-    public function cacheEntriesCanBeIterated(BackendInterface $backend): void
+    public function cacheEntriesCanBeIterated(): void
     {
-        $backend->flush();
-
-        // use data that contains binary junk
-        $data = random_bytes(128);
-        $backend->set('first_entry', $data);
-        $backend->set('second_entry', $data);
-        $backend->set('third_entry', $data);
-
-        $entries = 0;
-        foreach ($backend as $entry) {
-            self::assertEquals($data, $entry);
-            $entries++;
-        }
+        foreach ($this->backends as $backend) {
+            $backend->flush();
+
+            // use data that contains binary junk
+            $data = random_bytes(128);
+            $backend->set('first_entry', $data);
+            $backend->set('second_entry', $data);
+            $backend->set('third_entry', $data);
 
-        self::assertEquals(3, $entries);
+            $entries = 0;
+            foreach ($backend as $entry) {
+                self::assertEquals($data, $entry);
+                $entries++;
+            }
+
+            self::assertEquals(3, $entries);
+        }
     }
 
     private function setupBackends(): void
@@ -105,9 +105,8 @@ private function setupBackends(): void
             $backend->setup();
             $backend->setCache($this->cache);
             $backend->flush();
-            $this->backends['sqlite'] = [$backend];
-        } catch (\Throwable $t) {
-            $this->addWarning('SQLite DB is not reachable: ' . $t->getMessage());
+            $this->backends['sqlite'] = $backend;
+        } catch (\Throwable) {
         }
 
         try {
@@ -123,9 +122,8 @@ private function setupBackends(): void
             $backend->setup();
             $backend->setCache($this->cache);
             $backend->flush();
-            $this->backends['mysql'] = [$backend];
-        } catch (\Throwable $t) {
-            $this->addWarning('MySQL DB server is not reachable: ' . $t->getMessage());
+            $this->backends['mysql'] = $backend;
+        } catch (\Throwable) {
         }
 
         try {
@@ -141,9 +139,8 @@ private function setupBackends(): void
             $backend->setup();
             $backend->setCache($this->cache);
             $backend->flush();
-            $this->backends['pgsql'] = [$backend];
-        } catch (\Throwable $t) {
-            $this->addWarning('PostgreSQL DB server is not reachable: ' . $t->getMessage());
+            $this->backends['pgsql'] = $backend;
+        } catch (\Throwable) {
         }
     }
 }

Neos.Cache/Tests/Functional/Backend/RedisBackendTest.php

@@ -64,7 +64,7 @@ protected function setUp(): void
             ['hostname' => '127.0.0.1', 'database' => 0]
         );
         $this->cache = $this->createMock(FrontendInterface::class);
-        $this->cache->expects(self::any())->method('getIdentifier')->will(self::returnValue('TestCache'));
+        $this->cache->expects($this->any())->method('getIdentifier')->willReturn(('TestCache'));
         $this->backend->setCache($this->cache);
         $this->backend->flush();
     }

Neos.Cache/Tests/Unit/Backend/AbstractBackendTest.php

@@ -33,28 +33,24 @@ class AbstractBackendTest extends BaseTestCase
      */
     protected function setUp(): void
     {
-        class_exists(AbstractBackend::class);
-        $className = 'ConcreteBackend_' . md5(uniqid(mt_rand(), true));
-        eval('
-            class ' . $className . ' extends \Neos\Cache\Backend\AbstractBackend {
-                public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = NULL): void {}
-                public function get(string $entryIdentifier): string {}
-                public function has(string $entryIdentifier): bool {}
-                public function remove(string $entryIdentifier): bool {}
-                public function flush(): void {}
-                public function flushByTag(string $tag): int {}
-                public function flushByTags(array $tags): int {}
-                public function findIdentifiersByTag(string $tag): array {}
-                public function collectGarbage(): void {}
-                public function setSomeOption($value) {
-                    $this->someOption = $value;
-                }
-                public function getSomeOption() {
-                    return $this->someOption;
-                }
+        $this->backend = new class (new EnvironmentConfiguration('Ultraman Neos Testing', '/some/path', PHP_MAXPATHLEN)) extends \Neos\Cache\Backend\AbstractBackend {
+            protected $someOption;
+            public function set(string $entryIdentifier, string $data, array $tags = [], int $lifetime = NULL): void {}
+            public function get(string $entryIdentifier): string {}
+            public function has(string $entryIdentifier): bool {}
+            public function remove(string $entryIdentifier): bool {}
+            public function flush(): void {}
+            public function flushByTag(string $tag): int {}
+            public function flushByTags(array $tags): int {}
+            public function findIdentifiersByTag(string $tag): array {}
+            public function collectGarbage(): void {}
+            public function setSomeOption($value) {
+                $this->someOption = $value;
             }
-        ');
-        $this->backend = new $className(new EnvironmentConfiguration('Ultraman Neos Testing', '/some/path', PHP_MAXPATHLEN));
+            public function getSomeOption() {
+                return $this->someOption;
+            }
+        };
     }
 
     /**

Neos.Cache/Tests/Unit/Backend/ApcuBackendTest.php

@@ -228,12 +228,12 @@ public function flushRemovesAllCacheEntries()
     public function flushRemovesOnlyOwnEntries()
     {
         $thisCache = $this->createMock(FrontendInterface::class);
-        $thisCache->expects(self::any())->method('getIdentifier')->will(self::returnValue('thisCache'));
+        $thisCache->expects($this->any())->method('getIdentifier')->willReturn(('thisCache'));
         $thisBackend = new ApcuBackend($this->getEnvironmentConfiguration(), []);
         $thisBackend->setCache($thisCache);
 
         $thatCache = $this->createMock(FrontendInterface::class);
-        $thatCache->expects(self::any())->method('getIdentifier')->will(self::returnValue('thatCache'));
+        $thatCache->expects($this->any())->method('getIdentifier')->willReturn(('thatCache'));
         $thatBackend = new ApcuBackend($this->getEnvironmentConfiguration(), []);
         $thatBackend->setCache($thatCache);
 

Neos.Cache/Tests/Unit/Backend/FileBackendEntryDtoTest.php

@@ -13,7 +13,7 @@ class FileBackendEntryDtoTest extends BaseTestCase
 {
     /**
      */
-    public function validEntryConstructorParameters()
+    public static function validEntryConstructorParameters(): array
     {
         return [
             ['data', [], 0],
@@ -29,13 +29,8 @@ public function validEntryConstructorParameters()
     /**
      * @dataProvider validEntryConstructorParameters
      * @test
-     *
-     * @param string $data
-     * @param array $tags
-     * @param int $expiryTime
-     * @return void
      */
-    public function canBeCreatedWithConstructor($data, $tags, $expiryTime)
+    public function canBeCreatedWithConstructor(string $data, array $tags, int $expiryTime): void
     {
         $entryDto = new FileBackendEntryDto($data, $tags, $expiryTime);
         self::assertInstanceOf(FileBackendEntryDto::class, $entryDto);
@@ -44,13 +39,8 @@ public function canBeCreatedWithConstructor($data, $tags, $expiryTime)
     /**
      * @dataProvider validEntryConstructorParameters
      * @test
-     *
-     * @param $data
-     * @param $tags
-     * @param $expiryTime
-     * @return void
      */
-    public function gettersReturnDataProvidedToConstructor($data, $tags, $expiryTime)
+    public function gettersReturnDataProvidedToConstructor(string $data, array $tags, int $expiryTime): void
     {
         $entryDto = new FileBackendEntryDto($data, $tags, $expiryTime);
         self::assertEquals($data, $entryDto->getData());
@@ -60,19 +50,17 @@ public function gettersReturnDataProvidedToConstructor($data, $tags, $expiryTime
 
     /**
      * @test
-     * @return void
      */
-    public function isExpiredReturnsFalseIfExpiryTimeIsInFuture()
+    public function isExpiredReturnsFalseIfExpiryTimeIsInFuture(): void
     {
         $entryDto = new FileBackendEntryDto('data', [], time() + 10);
         self::assertFalse($entryDto->isExpired());
     }
 
     /**
      * @test
-     * @return void
      */
-    public function isExpiredReturnsTrueIfExpiryTimeIsInPast()
+    public function isExpiredReturnsTrueIfExpiryTimeIsInPast(): void
     {
         $entryDto = new FileBackendEntryDto('data', [], time() - 10);
         self::assertTrue($entryDto->isExpired());
@@ -81,9 +69,8 @@ public function isExpiredReturnsTrueIfExpiryTimeIsInPast()
     /**
      * @dataProvider validEntryConstructorParameters
      * @test
-     * @return void
      */
-    public function isIdempotent($data, $tags, $expiryTime)
+    public function isIdempotent(string $data, array $tags, int $expiryTime): void
     {
         $entryDto = new FileBackendEntryDto($data, $tags, $expiryTime);
         $entryString = (string)$entryDto;