Fix tests

- Fix InstallerTest case
- Fix native function mocking
- Add returntype for Unit-Tests
- Fixing ExtendedPDO test troubles
- Fix wrong class inheritance path for DatabaseTestTrait.php
- Fix SyslogLogger Server Exception for PHP8
- Add user/contact to database.fixture.php
- Avoid invalid rollbacks for test setup in PHP8

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index b69adc4a1e12c36c80334d415ef2d61a2c3e28c9..cc13c4bc897d697a587daa96b2a46f7595a4763f 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -27,4 +27,18 @@ namespace Friendica\Test;
 abstract class DatabaseTest extends MockedTest
 {
        use DatabaseTestTrait;
+
+       protected function setUp(): void
+       {
+               $this->setUpDb();
+
+               parent::setUp();
+       }
+
+       protected function tearDown(): void
+       {
+               $this->tearDownDb();
+
+               parent::tearDown();
+       }
 }

diff --git a/tests/DatabaseTestTrait.php b/tests/DatabaseTestTrait.php
index f667e05de6d1be2bf6fe61421a79c4d4d972c369..7d255c693b5b9ff996b5ee28d4771b15469293ca 100644 (file)
--- a/tests/DatabaseTestTrait.php
+++ b/tests/DatabaseTestTrait.php
@@ -29,23 +29,23 @@ use Friendica\Test\Util\Database\StaticDatabase;
  */
 trait DatabaseTestTrait
 {
-       protected function setUp()
+       protected function setUpDb()
        {
                StaticDatabase::statConnect($_SERVER);
                // Rollbacks every DB usage (in case the test couldn't call tearDown)
                StaticDatabase::statRollback();
                // Start the first, outer transaction
                StaticDatabase::getGlobConnection()->beginTransaction();
-
-               parent::setUp();
        }
 
-       protected function tearDown()
+       protected function tearDownDb()
        {
-               // Rollbacks every DB usage so we don't commit anything into the DB
-               StaticDatabase::statRollback();
-
-               parent::tearDown();
+               try {
+                       // Rollbacks every DB usage so we don't commit anything into the DB
+                       StaticDatabase::statRollback();
+               } catch (\PDOException $exception) {
+                       print_r("Found already rolled back transaction");
+               }
        }
 
        /**

diff --git a/tests/FixtureTest.php b/tests/FixtureTest.php
index 74abfdddbd330d3bbbc0adc9b12dd1e12850d892..f30b50878b7e40825e599851206a140c4d6d5aac 100644 (file)
--- a/tests/FixtureTest.php
+++ b/tests/FixtureTest.php
@@ -26,7 +26,7 @@ abstract class FixtureTest extends DatabaseTest
        /**
         * Create variables used by tests.
         */
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/MockedTest.php b/tests/MockedTest.php
index 81e43d669a144201103c0773546d413fc6fa0e98..fdbfe219dd90147a7fcc66352ba723be8e86f329 100644 (file)
--- a/tests/MockedTest.php
+++ b/tests/MockedTest.php
@@ -28,7 +28,7 @@ use PHPUnit\Framework\TestCase;
  */
 abstract class MockedTest extends TestCase
 {
-       protected function tearDown()
+       protected function tearDown() : void
        {
                \Mockery::close();
 

diff --git a/tests/Util/Database/ExtendedPDO.php b/tests/Util/Database/ExtendedPDO.php
index 606d91d0ecb58bd891597613ee3f07f517b0590d..6a59d2aeeca5aa01bf45a3c72ad106477222b4cc 100644 (file)
--- a/tests/Util/Database/ExtendedPDO.php
+++ b/tests/Util/Database/ExtendedPDO.php
@@ -67,8 +67,9 @@ class ExtendedPDO extends PDO
         */
        public function beginTransaction()
        {
-               if($this->_transactionDepth == 0 || !$this->hasSavepoint()) {
+               if($this->_transactionDepth <= 0 || !$this->hasSavepoint()) {
                        parent::beginTransaction();
+                       $this->_transactionDepth = $this->_transactionDepth < 0 ? 0 : $this->_transactionDepth;
                } else {
                        $this->exec("SAVEPOINT LEVEL{$this->_transactionDepth}");
                }
@@ -85,8 +86,9 @@ class ExtendedPDO extends PDO
        {
                $this->_transactionDepth--;
 
-               if($this->_transactionDepth == 0 || !$this->hasSavepoint()) {
+               if($this->_transactionDepth <= 0 || !$this->hasSavepoint()) {
                        parent::commit();
+                       $this->_transactionDepth = $this->_transactionDepth < 0 ? 0 : $this->_transactionDepth;
                } else {
                        $this->exec("RELEASE SAVEPOINT LEVEL{$this->_transactionDepth}");
                }
@@ -100,8 +102,7 @@ class ExtendedPDO extends PDO
         */
        public function rollBack()
        {
-
-               if ($this->_transactionDepth == 0) {
+               if ($this->_transactionDepth <= 0) {
                        throw new PDOException('Rollback error : There is no transaction started');
                }
 

diff --git a/tests/datasets/storage/database.fixture.php b/tests/datasets/storage/database.fixture.php
index 8e2e92ecc2590963fedfa2c2b3e795e0532d897d..6a73d4ed2aec5b8b556b424c0d8370442e3b2faf 100644 (file)
--- a/tests/datasets/storage/database.fixture.php
+++ b/tests/datasets/storage/database.fixture.php
@@ -19,11 +19,43 @@
  *
  */
 
+use Friendica\Core\Protocol;
+use Friendica\Model\Contact;
+
 return [
+       'user'    => [
+               [
+                       'uid'      => 42,
+                       'username' => 'Test user',
+                       'nickname' => 'selfcontact',
+                       'verified' => 1,
+                       'password' => '$2y$10$DLRNTRmJgKe1cSrFJ5Jb0edCqvXlA9sh/RHdSnfxjbR.04yZRm4Qm',
+                       'theme'    => 'frio',
+               ],
+       ],
+       'contact' => [
+               [
+                       'id'      => 42,
+                       'uid'     => 42,
+                       'name'    => 'Self contact',
+                       'nick'    => 'selfcontact',
+                       'self'    => 1,
+                       'nurl'    => 'http://localhost/profile/selfcontact',
+                       'url'     => 'http://localhost/profile/selfcontact',
+                       'about'   => 'User used in tests',
+                       'pending' => 0,
+                       'blocked' => 0,
+                       'rel'     => Contact::FOLLOWER,
+                       'network' => Protocol::DFRN,
+                       'location' => 'DFRN',
+               ],
+       ],
        'photo'   => [
                // move from data-attribute to storage backend
                [
                        'id'            => 1,
+                       'uid'           => 42,
+                       'contact-id'    => 42,
                        'backend-class' => null,
                        'backend-ref'   => 'f0c0d0i2',
                        'data'          => 'without class',
@@ -31,6 +63,8 @@ return [
                // move from storage-backend to maybe filesystem backend, skip at database backend
                [
                        'id'            => 2,
+                       'uid'           => 42,
+                       'contact-id'    => 42,
                        'backend-class' => 'Database',
                        'backend-ref'   => 1,
                        'data'          => '',
@@ -38,6 +72,8 @@ return [
                // move data if invalid storage
                [
                        'id'            => 3,
+                       'uid'           => 42,
+                       'contact-id'    => 42,
                        'backend-class' => 'invalid!',
                        'backend-ref'   => 'unimported',
                        'data'          => 'invalid data moved',
@@ -45,6 +81,8 @@ return [
 // @todo Check failing test because of this (never loaded) fixture
 //             [
 //                     'id'            => 4,
+//                     'uid'           => 42,
+//                     'contact-id'    => 42,
 //                     'backend-class' => 'invalid!',
 //                     'backend-ref'   => 'unimported',
 //                     'data'          => '',

diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php
index b6367ab91608becf84bab3cf0d43faa7155446e5..a7b45ccebeffa9ce1362436e524a77fbeb9bc5aa 100644 (file)
--- a/tests/functional/DependencyCheckTest.php
+++ b/tests/functional/DependencyCheckTest.php
@@ -45,7 +45,7 @@ class DependencyCheckTest extends TestCase
         */
        private $dice;
 
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index bced7eb19730301bce383a2ea620815e64ef6bc7..67daca802a0825907f47aeb3052658fa82b792be 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -50,7 +50,7 @@ class ApiTest extends FixtureTest
        /**
         * Create variables used by tests.
         */
-       protected function setUp()
+       protected function setUp() : void
        {
                global $API, $called_api;
                $API = [];

diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php
index b2a19726ded638c60847fe3147f7c6140140f98d..28393c6c267c13c5d924899c7ad3e8d393620e38 100644 (file)
--- a/tests/src/App/ModeTest.php
+++ b/tests/src/App/ModeTest.php
@@ -53,7 +53,7 @@ class ModeTest extends MockedTest
         */
        private $configCacheMock;
 
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/src/App/RouterTest.php b/tests/src/App/RouterTest.php
index 8bd7c467f71e0965b9a28f43b3338da626cb2b4b..a5824c45567983d129d4593709b11545d68c6156 100644 (file)
--- a/tests/src/App/RouterTest.php
+++ b/tests/src/App/RouterTest.php
@@ -40,7 +40,7 @@ class RouterTest extends TestCase
         */
        private $cache;
 
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/src/Console/AutomaticInstallationConsoleTest.php b/tests/src/Console/AutomaticInstallationConsoleTest.php
index d0d03a1b2c0e2ca3d55902306a8d243ee835f7e4..fcb3289b8ae077fbfb48a5aa863434da9a395b9f 100644 (file)
--- a/tests/src/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Console/AutomaticInstallationConsoleTest.php
@@ -76,7 +76,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
         */
        private $dice;
 
-       public function setUp()
+       public function setUp() : void
        {
                static::markTestSkipped('Needs class \'Installer\' as constructing argument for console tests');
 

diff --git a/tests/src/Console/ConfigConsoleTest.php b/tests/src/Console/ConfigConsoleTest.php
index 59aa07470cdc56f0360774e275258fba270a8230..5c670aedfcd4c26f0d1ab55e58112abe300c348a 100644 (file)
--- a/tests/src/Console/ConfigConsoleTest.php
+++ b/tests/src/Console/ConfigConsoleTest.php
@@ -38,7 +38,7 @@ class ConfigConsoleTest extends ConsoleTest
        /** @var IConfig|LegacyMockInterface|MockInterface */
        private $configMock;
 
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/src/Console/ConsoleTest.php b/tests/src/Console/ConsoleTest.php
index 74fc0530b4fc4f2dda5389cb845b72b232539ae9..a4315452dfd3c6e70fcd8b89890877c8e675d722 100644 (file)
--- a/tests/src/Console/ConsoleTest.php
+++ b/tests/src/Console/ConsoleTest.php
@@ -32,7 +32,7 @@ abstract class ConsoleTest extends MockedTest
         */
        protected $consoleArgv = [ 'consoleTest.php' ];
 
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/src/Console/LockConsoleTest.php b/tests/src/Console/LockConsoleTest.php
index aa7f62835cf2a3e13d045b13103018b58e0d021c..1f33be100e031e7876b111a3bef65a84fd5f81c9 100644 (file)
--- a/tests/src/Console/LockConsoleTest.php
+++ b/tests/src/Console/LockConsoleTest.php
@@ -40,7 +40,7 @@ class LockConsoleTest extends ConsoleTest
         */
        private $lockMock;
 
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/src/Console/ServerBlockConsoleTest.php b/tests/src/Console/ServerBlockConsoleTest.php
index 9899bf015a66b985896344743f91ba5d64ffef48..e19ebf9cbca218ec8fb0ca33423f8a1012c2b9d0 100644 (file)
--- a/tests/src/Console/ServerBlockConsoleTest.php
+++ b/tests/src/Console/ServerBlockConsoleTest.php
@@ -42,7 +42,7 @@ class ServerBlockConsoleTest extends ConsoleTest
         */
        private $configMock;
 
-       protected function setUp()
+       protected function setUp() : void
        {
                parent::setUp();
 

diff --git a/tests/src/Content/SmiliesTest.php b/tests/src/Content/SmiliesTest.php
index a3633cea53a0e812f779c4eb0093772fdf2b5ccb..8d4624298c50fb434660d07780760f07bdb7c306 100644 (file)
--- a/tests/src/Content/SmiliesTest.php
+++ b/tests/src/Content/SmiliesTest.php
@@ -19,7 +19,7 @@ class SmiliesTest extends MockedTest
        use VFSTrait;
        use AppMockTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
                $this->setUpVfsDir();

diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 0bf281d6ff0e042220ba344a9e46bd64e942a4ba..46f153edc2349152cc221a27d072bf9a25dc6546 100644 (file)
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -35,7 +35,7 @@ class BBCodeTest extends MockedTest
        use VFSTrait;
        use AppMockTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
                $this->setUpVfsDir();

diff --git a/tests/src/Content/Text/HTMLTest.php b/tests/src/Content/Text/HTMLTest.php
index 20106d54a73c6d38e1423f833c17d018f42d3828..bf5e676a9c2a8bc5dac9af6936888d05a0b1ddb2 100644 (file)
--- a/tests/src/Content/Text/HTMLTest.php
+++ b/tests/src/Content/Text/HTMLTest.php
@@ -33,7 +33,7 @@ class HTMLTest extends MockedTest
        use VFSTrait;
        use AppMockTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
                $this->setUpVfsDir();

diff --git a/tests/src/Content/Text/MarkdownTest.php b/tests/src/Content/Text/MarkdownTest.php
index 2b23b8da425db3374a451bb2a92660536011a3ae..5fae494d6fb82639d7d74f01a6522a34a89fe518 100644 (file)
--- a/tests/src/Content/Text/MarkdownTest.php
+++ b/tests/src/Content/Text/MarkdownTest.php
@@ -32,7 +32,7 @@ class MarkdownTest extends MockedTest
        use VFSTrait;
        use AppMockTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
                $this->setUpVfsDir();

diff --git a/tests/src/Core/Cache/APCuCacheTest.php b/tests/src/Core/Cache/APCuCacheTest.php
index 4e7815ba174f83d22c2e71efbbe35b9bfc8b785c..d8fe59da03ac0e416f9bd1a0f1086e2dc28e4c60 100644 (file)
--- a/tests/src/Core/Cache/APCuCacheTest.php
+++ b/tests/src/Core/Cache/APCuCacheTest.php
@@ -28,7 +28,7 @@ use Friendica\Core\Cache\APCuCache;
  */
 class APCuCacheTest extends MemoryCacheTest
 {
-       protected function setUp()
+       protected function setUp(): void
        {
                if (!APCuCache::isAvailable()) {
                        static::markTestSkipped('APCu is not available');
@@ -43,7 +43,7 @@ class APCuCacheTest extends MemoryCacheTest
                return $this->cache;
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                $this->cache->clear(false);
                parent::tearDown();

diff --git a/tests/src/Core/Cache/ArrayCacheTest.php b/tests/src/Core/Cache/ArrayCacheTest.php
index 2d8d0ff837c1efd53e969dc51033f01290d64a45..ada1fac6549a4e8d88efe6791ac5f709922e2243 100644 (file)
--- a/tests/src/Core/Cache/ArrayCacheTest.php
+++ b/tests/src/Core/Cache/ArrayCacheTest.php
@@ -31,7 +31,7 @@ class ArrayCacheTest extends MemoryCacheTest
                return $this->cache;
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                $this->cache->clear(false);
                parent::tearDown();

diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php
index f491e00e3dd32e59d43528e3f988a11e2e366c87..5e5d1c17d5bb3e04818a459f535c073134b40df6 100644 (file)
--- a/tests/src/Core/Cache/CacheTest.php
+++ b/tests/src/Core/Cache/CacheTest.php
@@ -81,7 +81,7 @@ abstract class CacheTest extends MockedTest
 
        abstract protected function getInstance();
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Core/Cache/DatabaseCacheTest.php b/tests/src/Core/Cache/DatabaseCacheTest.php
index cd96b064f144b91fe1b75ee515a94dec39627082..458f3faa203f29fafa283889056f3a08740203a7 100644 (file)
--- a/tests/src/Core/Cache/DatabaseCacheTest.php
+++ b/tests/src/Core/Cache/DatabaseCacheTest.php
@@ -36,10 +36,12 @@ class DatabaseCacheTest extends CacheTest
        use DatabaseTestTrait;
        use VFSTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                $this->setUpVfsDir();
 
+               $this->setUpDb();
+
                parent::setUp();
        }
 
@@ -60,9 +62,12 @@ class DatabaseCacheTest extends CacheTest
                return $this->cache;
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                $this->cache->clear(false);
+
+               $this->tearDownDb();
+
                parent::tearDown();
        }
 }

diff --git a/tests/src/Core/Cache/MemcacheCacheTest.php b/tests/src/Core/Cache/MemcacheCacheTest.php
index 22b95ad2ef646e0c676cf8e562027ba700e6458d..738ff8100fb05654c7796f0d46d0b182890c191b 100644 (file)
--- a/tests/src/Core/Cache/MemcacheCacheTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheTest.php
@@ -56,7 +56,7 @@ class MemcacheCacheTest extends MemoryCacheTest
                return $this->cache;
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                $this->cache->clear(false);
                parent::tearDown();

diff --git a/tests/src/Core/Cache/MemcachedCacheTest.php b/tests/src/Core/Cache/MemcachedCacheTest.php
index 64aaf58fb8efbdf01138e265657da280eac25a3f..88de1ad41d8474a1cc0796adbb502d16f3b76d01 100644 (file)
--- a/tests/src/Core/Cache/MemcachedCacheTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheTest.php
@@ -55,7 +55,7 @@ class MemcachedCacheTest extends MemoryCacheTest
                return $this->cache;
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                $this->cache->clear(false);
                parent::tearDown();

diff --git a/tests/src/Core/Cache/MemoryCacheTest.php b/tests/src/Core/Cache/MemoryCacheTest.php
index b2a88e49dbaf2e91ef52a8302713a4d1ecbfb862..eca25fa69404c86027f0db884670b1f297a21741 100644 (file)
--- a/tests/src/Core/Cache/MemoryCacheTest.php
+++ b/tests/src/Core/Cache/MemoryCacheTest.php
@@ -31,7 +31,7 @@ abstract class MemoryCacheTest extends CacheTest
         */
        protected $instance;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Core/Cache/RedisCacheTest.php b/tests/src/Core/Cache/RedisCacheTest.php
index 5436d58a50cbf305250c53d4b859e46e437d7e2e..146dca6d9f05986743f3516e1a6373ab78d426b3 100644 (file)
--- a/tests/src/Core/Cache/RedisCacheTest.php
+++ b/tests/src/Core/Cache/RedisCacheTest.php
@@ -65,7 +65,7 @@ class RedisCacheTest extends MemoryCacheTest
                return $this->cache;
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                $this->cache->clear(false);
                parent::tearDown();

diff --git a/tests/src/Core/Config/ConfigTest.php b/tests/src/Core/Config/ConfigTest.php
index 8d140e1c75d65cdb77e084283e609e15bf55bf6a..734f6bff7935fecaf54ce9894c73a0de0beac7ef 100644 (file)
--- a/tests/src/Core/Config/ConfigTest.php
+++ b/tests/src/Core/Config/ConfigTest.php
@@ -55,7 +55,7 @@ abstract class ConfigTest extends MockedTest
        }
 
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index b3f91e7d33609a0bb217aa13f695077f41b85e25..7404e216e2389661bb17bb465c25b6512fd25946 100644 (file)
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -45,7 +45,7 @@ class InstallerTest extends MockedTest
         */
        private $dice;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -64,6 +64,15 @@ class InstallerTest extends MockedTest
                DI::init($this->dice);
        }
 
+       public static function tearDownAfterClass(): void
+       {
+               // Reset mocking
+               global $phpMock;
+               $phpMock = [];
+
+               parent::tearDownAfterClass();
+       }
+
        private function mockL10nT(string $text, $times = null)
        {
                $this->l10nMock->shouldReceive('t')->with($text)->andReturn($text)->times($times);
@@ -467,7 +476,7 @@ class InstallerTest extends MockedTest
         */
        public function testSetUpCache()
        {
-               $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; })->times(5);
+               $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
 
                $install = new Installer();
                $configCache = Mockery::mock(Cache::class);

diff --git a/tests/src/Core/Lock/APCuCacheLockTest.php b/tests/src/Core/Lock/APCuCacheLockTest.php
index bbcbfe54add4b099ef86417c921d31bd74a0083e..9f893ab32408a5fd94cf9b2bf6ed7fe43aca3150 100644 (file)
--- a/tests/src/Core/Lock/APCuCacheLockTest.php
+++ b/tests/src/Core/Lock/APCuCacheLockTest.php
@@ -29,7 +29,7 @@ use Friendica\Core\Lock\CacheLock;
  */
 class APCuCacheLockTest extends LockTest
 {
-       protected function setUp()
+       protected function setUp(): void
        {
                if (!APCuCache::isAvailable()) {
                        static::markTestSkipped('APCu is not available');

diff --git a/tests/src/Core/Lock/DatabaseLockDriverTest.php b/tests/src/Core/Lock/DatabaseLockDriverTest.php
index fa120e03ab9584fd473255a9bb628165125d3d36..bc4a9a63b8cc7b1148170832cf1027099e3b35e7 100644 (file)
--- a/tests/src/Core/Lock/DatabaseLockDriverTest.php
+++ b/tests/src/Core/Lock/DatabaseLockDriverTest.php
@@ -38,10 +38,12 @@ class DatabaseLockDriverTest extends LockTest
 
        protected $pid = 123;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                $this->setUpVfsDir();
 
+               $this->setUpDb();
+
                parent::setUp();
        }
 
@@ -60,4 +62,11 @@ class DatabaseLockDriverTest extends LockTest
 
                return new DatabaseLock($dba, $this->pid);
        }
+
+       protected function tearDown(): void
+       {
+               $this->tearDownDb();
+
+               parent::tearDown();
+       }
 }

diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php
index 3b7496915a0b07bc382ef0da272810eb7f51c320..8fc4926b06b08293bd26377c416fb7a149812cb9 100644 (file)
--- a/tests/src/Core/Lock/LockTest.php
+++ b/tests/src/Core/Lock/LockTest.php
@@ -38,7 +38,7 @@ abstract class LockTest extends MockedTest
 
        abstract protected function getInstance();
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -46,7 +46,7 @@ abstract class LockTest extends MockedTest
                $this->instance->releaseAll(true);
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                $this->instance->releaseAll(true);
                parent::tearDown();

diff --git a/tests/src/Core/Lock/SemaphoreLockTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php
index 71273fdc2c0289749778a5038c741b88370291fd..ca5d0af7db8dc350eda9f6a8352eb327ddc0a12a 100644 (file)
--- a/tests/src/Core/Lock/SemaphoreLockTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockTest.php
@@ -32,7 +32,7 @@ use Mockery\MockInterface;
 
 class SemaphoreLockTest extends LockTest
 {
-       protected function setUp()
+       protected function setUp(): void
        {
                /** @var MockInterface|Dice $dice */
                $dice = Mockery::mock(Dice::class)->makePartial();

diff --git a/tests/src/Core/PConfig/PConfigTest.php b/tests/src/Core/PConfig/PConfigTest.php
index 9b796e2fe8c6e71fa5d6a295d2e33ff9b03181cc..f35aa10d98acce29b41bf9017e47e62a80d66a54 100644 (file)
--- a/tests/src/Core/PConfig/PConfigTest.php
+++ b/tests/src/Core/PConfig/PConfigTest.php
@@ -57,7 +57,7 @@ abstract class PConfigTest extends MockedTest
        }
 
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Core/StorageManagerTest.php b/tests/src/Core/StorageManagerTest.php
index 965eb055586c9f4de9a4fa8f6468c8c2aa54349d..d2078c7e2a085c94cd08ee883df71ce33b2e56d0 100644 (file)
--- a/tests/src/Core/StorageManagerTest.php
+++ b/tests/src/Core/StorageManagerTest.php
@@ -57,7 +57,7 @@ class StorageManagerTest extends DatabaseTest
 
        use VFSTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -296,7 +296,7 @@ class StorageManagerTest extends DatabaseTest
        public function testMoveStorage($name, $assert, $assertName, $userBackend)
        {
                if (!$userBackend) {
-                       return;
+                       self::markTestSkipped("No user backend");
                }
 
                $this->loadFixture(__DIR__ . '/../../datasets/storage/database.fixture.php', $this->dba);

diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index c013dcda836004ec1dcc2f23adfc5ebcf19b7784..b5dbf2f2c58316531d455313e89301601ebf1f28 100644 (file)
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -10,7 +10,7 @@ use Friendica\Test\Util\Database\StaticDatabase;
 
 class DBATest extends DatabaseTest
 {
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 03aa34b8cb9a023b707df7eaa7212d55332ac01a..87535b5a3e6b3b444ab9c5884388c88dfa1f5669 100644 (file)
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -30,7 +30,7 @@ use Friendica\Test\Util\Database\StaticDatabase;
 
 class DBStructureTest extends DatabaseTest
 {
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Model/ProcessTest.php b/tests/src/Model/ProcessTest.php
index fb02f62ff165769681a416e113985d2b926ad010..b6e610238ea5d73563eaff63a5e7d5a95da1be9c 100644 (file)
--- a/tests/src/Model/ProcessTest.php
+++ b/tests/src/Model/ProcessTest.php
@@ -18,7 +18,7 @@ class ProcessTest extends DatabaseTest
        /** @var StaticDatabase */
        private $dba;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -71,6 +71,9 @@ class ProcessTest extends DatabaseTest
                self::assertEquals([['command' => 'test']], $this->dba->selectToArray('process', ['command'], ['pid' => 1]));
        }
 
+       /**
+        * @doesNotPerformAssertions
+        */
        public function testWrongDelete()
        {
                $process = new Process($this->dba);

diff --git a/tests/src/Model/Storage/DatabaseStorageTest.php b/tests/src/Model/Storage/DatabaseStorageTest.php
index 1952678e8c150c9e57dfae4a16a1ff965a131184..45793b47af2308f47ed03081bce02ff3fc93e6e1 100644 (file)
--- a/tests/src/Model/Storage/DatabaseStorageTest.php
+++ b/tests/src/Model/Storage/DatabaseStorageTest.php
@@ -38,10 +38,12 @@ class DatabaseStorageTest extends StorageTest
        use DatabaseTestTrait;
        use VFSTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                $this->setUpVfsDir();
 
+               $this->setUpDb();
+
                parent::setUp();
        }
 
@@ -68,4 +70,11 @@ class DatabaseStorageTest extends StorageTest
        {
                self::assertEmpty($storage->getOptions());
        }
+
+       protected function tearDown(): void
+       {
+               $this->tearDownDb();
+
+               parent::tearDown();
+       }
 }

diff --git a/tests/src/Model/Storage/FilesystemStorageTest.php b/tests/src/Model/Storage/FilesystemStorageTest.php
index 844197da53329aace5d836509a9a7614e846e21f..6d50e06c40254f0ec3e28a32addb930818543c89 100644 (file)
--- a/tests/src/Model/Storage/FilesystemStorageTest.php
+++ b/tests/src/Model/Storage/FilesystemStorageTest.php
@@ -39,7 +39,7 @@ class FilesystemStorageTest extends StorageTest
        /** @var MockInterface|IConfig */
        protected $config;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                $this->setUpVfsDir();
 

diff --git a/tests/src/Model/User/CookieTest.php b/tests/src/Model/User/CookieTest.php
index 2be1962d42f2c3a1ba860ec494b4cf2d0fc2bdd1..c9656b84f87828fcf710a2eddfefec016ae423cf 100644 (file)
--- a/tests/src/Model/User/CookieTest.php
+++ b/tests/src/Model/User/CookieTest.php
@@ -35,7 +35,7 @@ class CookieTest extends MockedTest
        /** @var MockInterface|BaseURL */
        private $baseUrl;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                StaticCookie::clearStatic();
 
@@ -45,7 +45,7 @@ class CookieTest extends MockedTest
                $this->baseUrl = \Mockery::mock(BaseURL::class);
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                StaticCookie::clearStatic();
 

diff --git a/tests/src/Model/UserTest.php b/tests/src/Model/UserTest.php
index d754adde79cc41f950612be1bbe5a8322032d0cc..8f8b2c3d7dcf3eddbef1fef9b7a3e2cf0cea9155 100644 (file)
--- a/tests/src/Model/UserTest.php
+++ b/tests/src/Model/UserTest.php
@@ -37,7 +37,7 @@ class UserTest extends MockedTest
        private $child;
        private $manage;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Network/CurlResultTest.php b/tests/src/Network/CurlResultTest.php
index 47bec3e687bb8fe1ceaf2b74adc065909feaa96c..090479642ab90b061ab0aa8d9175ab114594a143 100644 (file)
--- a/tests/src/Network/CurlResultTest.php
+++ b/tests/src/Network/CurlResultTest.php
@@ -31,7 +31,7 @@ use Psr\Log\NullLogger;
 
 class CurlResultTest extends TestCase
 {
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Util/Config/ConfigFileLoaderTest.php b/tests/src/Util/Config/ConfigFileLoaderTest.php
index d197450495ab61e56f82de1544baf171c7e88c82..781e1415f72d1fbeba2ae183f48f255208193183 100644 (file)
--- a/tests/src/Util/Config/ConfigFileLoaderTest.php
+++ b/tests/src/Util/Config/ConfigFileLoaderTest.php
@@ -31,7 +31,7 @@ class ConfigFileLoaderTest extends MockedTest
 {
        use VFSTrait;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Util/CryptoTest.php b/tests/src/Util/CryptoTest.php
index c9263ffccf68630c6e647eadae3f89d887ca0a8f..16770ff6491e3e76534d4a531ed1c502cd899ca5 100644 (file)
--- a/tests/src/Util/CryptoTest.php
+++ b/tests/src/Util/CryptoTest.php
@@ -29,6 +29,15 @@ use PHPUnit\Framework\TestCase;
 
 class CryptoTest extends TestCase
 {
+       public static function tearDownAfterClass(): void
+       {
+               // Reset mocking
+               global $phpMock;
+               $phpMock = [];
+
+               parent::tearDownAfterClass();
+       }
+
        /**
         * Replaces random_int results with given mocks
         *

diff --git a/tests/src/Util/EMailerTest.php b/tests/src/Util/EMailerTest.php
index 523d3de1222a1304b528430ec7b6ff214d40a63e..3b1c3cc1f386fbea9e325df178c1efc96645e6ea 100644 (file)
--- a/tests/src/Util/EMailerTest.php
+++ b/tests/src/Util/EMailerTest.php
@@ -35,7 +35,7 @@ class EMailerTest extends MockedTest
        /** @var BaseURL|MockInterface */
        private $baseUrl;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -53,7 +53,7 @@ class EMailerTest extends MockedTest
                $this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                EmailerSpy::$MAIL_DATA = [];
 

diff --git a/tests/src/Util/Emailer/MailBuilderTest.php b/tests/src/Util/Emailer/MailBuilderTest.php
index e2609288927237894e0f1675b683904086af23bb..933203d156d87e54a2ed6eef93a34c99f362d82a 100644 (file)
--- a/tests/src/Util/Emailer/MailBuilderTest.php
+++ b/tests/src/Util/Emailer/MailBuilderTest.php
@@ -51,7 +51,7 @@ class MailBuilderTest extends MockedTest
        /** @var string */
        private $defaultHeaders;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Util/Emailer/SystemMailBuilderTest.php b/tests/src/Util/Emailer/SystemMailBuilderTest.php
index 4ee81a7c919afd09149fd952cb355e2784fb160b..87b51030f77f45fe387b9149d384c95e30b7c2a0 100644 (file)
--- a/tests/src/Util/Emailer/SystemMailBuilderTest.php
+++ b/tests/src/Util/Emailer/SystemMailBuilderTest.php
@@ -41,7 +41,7 @@ class SystemMailBuilderTest extends MockedTest
        /** @var BaseURL */
        private $baseUrl;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Util/Logger/AbstractLoggerTest.php b/tests/src/Util/Logger/AbstractLoggerTest.php
index 5c87d1cf412d76342d73c96ccf182a59cd0a4e4f..44e210b9ca4e85803f4cbd18a1e22973c30fe464 100644 (file)
--- a/tests/src/Util/Logger/AbstractLoggerTest.php
+++ b/tests/src/Util/Logger/AbstractLoggerTest.php
@@ -58,7 +58,7 @@ abstract class AbstractLoggerTest extends MockedTest
         */
        abstract protected function getInstance($level = LogLevel::DEBUG);
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Util/Logger/ProfilerLoggerTest.php b/tests/src/Util/Logger/ProfilerLoggerTest.php
index 9dd82b4276575237887484cf1d4b3d8a4528237b..7719292b097969a10347000b129e2e53bbcda2f1 100644 (file)
--- a/tests/src/Util/Logger/ProfilerLoggerTest.php
+++ b/tests/src/Util/Logger/ProfilerLoggerTest.php
@@ -41,7 +41,7 @@ class ProfilerLoggerTest extends MockedTest
         */
        private $profiler;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Util/Logger/StreamLoggerTest.php b/tests/src/Util/Logger/StreamLoggerTest.php
index d0cf87e970b0befa70b0a28400c67a4ae480dc0b..7a3315e7efe7cd420e71fd0fdeb760587530806a 100644 (file)
--- a/tests/src/Util/Logger/StreamLoggerTest.php
+++ b/tests/src/Util/Logger/StreamLoggerTest.php
@@ -42,7 +42,7 @@ class StreamLoggerTest extends AbstractLoggerTest
         */
        private $fileSystem;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 

diff --git a/tests/src/Util/Logger/SyslogLoggerTest.php b/tests/src/Util/Logger/SyslogLoggerTest.php
index 61c0d874a8ea992a712c49fca9b685a4d20e4ad5..9408495e747f2b57a069ff7527f3daa89a9fed2a 100644 (file)
--- a/tests/src/Util/Logger/SyslogLoggerTest.php
+++ b/tests/src/Util/Logger/SyslogLoggerTest.php
@@ -31,7 +31,7 @@ class SyslogLoggerTest extends AbstractLoggerTest
         */
        private $logger;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -86,8 +86,13 @@ class SyslogLoggerTest extends AbstractLoggerTest
         */
        public function testServerException()
        {
-               $this->expectException(\UnexpectedValueException::class);
-               $this->expectExceptionMessageRegExp("/Can\'t open syslog for ident \".*\" and facility \".*\": .* /");
+               if (PHP_MAJOR_VERSION < 8) {
+                       $this->expectException(\UnexpectedValueException::class);
+                       $this->expectExceptionMessageRegExp("/Can\'t open syslog for ident \".*\" and facility \".*\": .* /");
+               } else {
+                       $this->expectException(\TypeError::class);
+                       $this->expectExceptionMessage("openlog(): Argument #3 (\$facility) must be of type int, string given");
+               }
 
                $logger = new SyslogLoggerWrapper('test', $this->introspection, LogLevel::DEBUG, null, 'a string');
                $logger->emergency('not working');

diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
index b0176f0fdb59ae0160bb232c9a1b889d6ed1b0cb..da0546d1bed9bcf1ac58d83ce6a63e5dbb21489a 100644 (file)
--- a/tests/src/Util/ProfilerTest.php
+++ b/tests/src/Util/ProfilerTest.php
@@ -35,7 +35,7 @@ class ProfilerTest extends MockedTest
         */
        private $logger;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();