Merge pull request #10112 from nupplaphil/feat/phpunit_upgrade

Enable PHP 8.0 Unit-Tests

.github/workflows/php.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -62,6 +62,9 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist
 
+      - name: Setup PHPUnit 8
+        run: bin/dev/setup-phpunit.sh
+
       - name: Copy default Friendica config
         run: cp config/local-sample.config.php config/local.config.php
 
@@ -83,7 +86,7 @@ jobs:
         run: vendor/bin/parallel-lint --exclude vendor/ --exclude view/asset/ .
 
       - name: Test with phpunit
-        run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
+        run: $(git rev-parse --show-toplevel)/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
         env:
           MYSQL_HOST: 127.0.0.1
           MYSQL_PORT: ${{ job.services.mariadb.ports[3306] }}

.gitignore

@@ -79,3 +79,6 @@ venv/
 
 #Ignore log folder
 /log
+
+#Ignore temporary installed phpunit
+/bin/phpunit

bin/dev/setup-phpunit.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+PHPUNIT="$(git rev-parse --show-toplevel)/bin/phpunit"
+
+if ! [ -x "$PHPUNIT" ]; then
+	echo "Install PHPUnit 8"
+	cd /tmp/
+	curl -s -O -L https://phar.phpunit.de/phpunit-8.phar
+	chmod +x phpunit-8.phar
+	mv phpunit-8.phar $PHPUNIT
+fi
+
+echo "Using $PHPUNIT $($PHPUNIT --version)"

composer.json

@@ -124,12 +124,9 @@
 		]
 	},
 	"require-dev": {
-		"phpdocumentor/reflection-docblock": "^3.0.2",
-		"phpunit/php-token-stream": "^1.4.2",
-		"mikey179/vfsstream": "^1.6",
-		"mockery/mockery": "^1.2",
-		"johnkary/phpunit-speedtrap": "1.1",
-		"php-parallel-lint/php-parallel-lint": "^1.2"
+		"php-parallel-lint/php-parallel-lint": "^1.2",
+		"mockery/mockery": "^1.3",
+		"mikey179/vfsstream": "^1.6"
 	},
 	"scripts": {
 		"test": "phpunit"

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();
+	}
 }

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");
+		}
 	}
 
 	/**

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();
 

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();
 

tests/README.md

@@ -0,0 +1,13 @@
+# Using the Friendica tests
+
+## Install PHPUnit
+
+Please use [setup-phpunit.sh](https://github.com/friendica/friendica/bin/dev/setup-phpunit.sh) to install the necessary PHPUnit version.
+It will temporarily install the `phpunit` phar file into the `bin/` subdirectory 
+
+
+Currently, Friendica uses PHPUnit 8.
+
+## Supported PHP versions of these tests
+
+The Unit-Tests of Friendica requires at least PHP 7.2.

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');
 		}
 

tests/bootstrap.php

@@ -24,6 +24,12 @@ use Dice\Dice;
 use Friendica\DI;
 use PHPUnit\Framework\TestCase;
 
+if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
+	die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.');
+}
+
+require __DIR__ . '/../vendor/autoload.php';
+
 // Backward compatibility
 if (!class_exists(TestCase::class)) {
 	class_alias(PHPUnit_Framework_TestCase::class, TestCase::class);

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'          => '',

tests/functional/DependencyCheckTest.php

@@ -45,7 +45,7 @@ class DependencyCheckTest extends TestCase
 	 */
 	private $dice;
 
-	protected function setUp()
+	protected function setUp() : void
 	{
 		parent::setUp();
 

tests/legacy/ApiTest.php

@@ -22,6 +22,8 @@ require_once __DIR__ . '/../../include/api.php';
  *
  * Functions that use header() need to be tested in a separate process.
  * @see https://phpunit.de/manual/5.7/en/appendixes.annotations.html#appendixes.annotations.runTestsInSeparateProcesses
+ *
+ * @backupGlobals enabled
  */
 class ApiTest extends FixtureTest
 {
@@ -48,7 +50,7 @@ class ApiTest extends FixtureTest
 	/**
 	 * Create variables used by tests.
 	 */
-	protected function setUp()
+	protected function setUp() : void
 	{
 		global $API, $called_api;
 		$API = [];
@@ -108,10 +110,6 @@ class ApiTest extends FixtureTest
 			'authenticated' => true,
 			'uid'           => $this->selfUser['id']
 		];
-
-		$_POST   = [];
-		$_GET    = [];
-		$_SERVER = [];
 	}
 
 	/**
@@ -140,7 +138,7 @@ class ApiTest extends FixtureTest
 	 *
 	 * @return void
 	 */
-	private function assertOtherUser(array $user)
+	private function assertOtherUser(array $user = [])
 	{
 		self::assertEquals($this->otherUser['id'], $user['id']);
 		self::assertEquals($this->otherUser['id'], $user['id_str']);
@@ -157,10 +155,10 @@ class ApiTest extends FixtureTest
 	 *
 	 * @return void
 	 */
-	private function assertStatus(array $status)
+	private function assertStatus(array $status = [])
 	{
-		self::assertInternalType('string', $status['text']);
-		self::assertInternalType('int', $status['id']);
+		self::assertInternalType('string', $status['text'] ?? '');
+		self::assertInternalType('int', $status['id'] ?? '');
 		// We could probably do more checks here.
 	}
 
@@ -171,7 +169,7 @@ class ApiTest extends FixtureTest
 	 *
 	 * @return void
 	 */
-	private function assertList(array $list)
+	private function assertList(array $list = [])
 	{
 		self::assertInternalType('string', $list['name']);
 		self::assertInternalType('int', $list['id']);
@@ -188,7 +186,7 @@ class ApiTest extends FixtureTest
 	 *
 	 * @return void
 	 */
-	private function assertXml($result, $root_element)
+	private function assertXml($result = '', $root_element = '')
 	{
 		self::assertStringStartsWith('<?xml version="1.0"?>', $result);
 		self::assertContains('<' . $root_element, $result);
@@ -302,8 +300,9 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_login() function without any login.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 * @preserveGlobalState disabled
 	 * @expectedException Friendica\Network\HTTPException\UnauthorizedException
 	 */
 	public function testApiLoginWithoutLogin()
@@ -314,8 +313,9 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_login() function with a bad login.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 * @preserveGlobalState disabled
 	 * @expectedException Friendica\Network\HTTPException\UnauthorizedException
 	 */
 	public function testApiLoginWithBadLogin()
@@ -347,8 +347,9 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_login() function with a correct login.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 * @doesNotPerformAssertions
 	 */
 	public function testApiLoginWithCorrectLogin()
 	{
@@ -360,8 +361,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_login() function with a remote user.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 * @expectedException Friendica\Network\HTTPException\UnauthorizedException
 	 */
 	public function testApiLoginWithRemoteUser()
@@ -404,8 +405,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCall()
 	{
@@ -431,8 +432,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with the profiled enabled.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithProfiler()
 	{
@@ -468,8 +469,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function without any result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithNoResult()
 	{
@@ -494,8 +495,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with an unimplemented API.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithUninplementedApi()
 	{
@@ -508,8 +509,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with a JSON result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithJson()
 	{
@@ -534,8 +535,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with an XML result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithXml()
 	{
@@ -560,8 +561,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with an RSS result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithRss()
 	{
@@ -587,8 +588,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with an Atom result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithAtom()
 	{
@@ -614,8 +615,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with an unallowed method.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithWrongMethod()
 	{
@@ -635,8 +636,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_call() function with an unauthorized user.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiCallWithWrongAuth()
 	{
@@ -660,8 +661,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_error() function with a JSON result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiErrorWithJson()
 	{
@@ -674,8 +675,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_error() function with an XML result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiErrorWithXml()
 	{
@@ -695,8 +696,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_error() function with an RSS result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiErrorWithRss()
 	{
@@ -716,8 +717,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_error() function with an Atom result.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiErrorWithAtom()
 	{
@@ -859,8 +860,8 @@ class ApiTest extends FixtureTest
 	/**
 	 * Test the api_get_user() function with an user that is not allowed to use the API.
 	 *
-	 * @return void
 	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testApiGetUserWithoutApiUser()
 	{
@@ -1312,8 +1313,8 @@ class ApiTest extends FixtureTest
 
 	/**
 	 * Test the api_media_upload() function.
-	 *
-	 * @return void
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 * @expectedException Friendica\Network\HTTPException\BadRequestException
 	 */
 	public function testApiMediaUpload()
@@ -1504,7 +1505,7 @@ class ApiTest extends FixtureTest
 		$result             = api_search('json');
 		foreach ($result['status'] as $status) {
 			self::assertStatus($status);
-			self::assertContains('reply', $status['text'], null, true);
+			self::assertContains('reply', $status['text'], '', true);
 		}
 	}
 
@@ -1520,7 +1521,7 @@ class ApiTest extends FixtureTest
 		$result            = api_search('json');
 		foreach ($result['status'] as $status) {
 			self::assertStatus($status);
-			self::assertContains('reply', $status['text'], null, true);
+			self::assertContains('reply', $status['text'], '', true);
 		}
 	}
 
@@ -1536,14 +1537,13 @@ class ApiTest extends FixtureTest
 		$result          = api_search('json');
 		foreach ($result['status'] as $status) {
 			self::assertStatus($status);
-			self::assertContains('reply', $status['text'], null, true);
+			self::assertContains('reply', $status['text'], '', true);
 		}
 	}
 
 	/**
 	 * Test the api_search() function with an q parameter contains hashtag.
-	 *
-	 * @return void
+	 * @doesNotPerformAssertions
 	 */
 	public function testApiSearchWithHashtag()
 	{
@@ -1551,14 +1551,13 @@ class ApiTest extends FixtureTest
 		$result        = api_search('json');
 		foreach ($result['status'] as $status) {
 			self::assertStatus($status);
-			self::assertContains('#friendica', $status['text'], null, true);
+			self::assertContains('#friendica', $status['text'], '', true);
 		}
 	}
 
 	/**
 	 * Test the api_search() function with an exclude_replies parameter.
-	 *
-	 * @return void
+	 * @doesNotPerformAssertions
 	 */
 	public function testApiSearchWithExcludeReplies()
 	{
@@ -2474,8 +2473,7 @@ class ApiTest extends FixtureTest
 
 	/**
 	 * Test the api_format_items() function.
-	 *
-	 * @return void
+	 * @doesNotPerformAssertions
 	 */
 	public function testApiFormatItems()
 	{
@@ -2500,8 +2498,7 @@ class ApiTest extends FixtureTest
 
 	/**
 	 * Test the api_format_items() function with an XML result.
-	 *
-	 * @return void
+	 * @doesNotPerformAssertions
 	 */
 	public function testApiFormatItemsWithXml()
 	{
@@ -2617,8 +2614,7 @@ class ApiTest extends FixtureTest
 
 	/**
 	 * Test the api_lists_statuses() function with a list ID.
-	 *
-	 * @return void
+	 * @doesNotPerformAssertions
 	 */
 	public function testApiListsStatusesWithListId()
 	{
@@ -3271,8 +3267,6 @@ class ApiTest extends FixtureTest
 
 	/**
 	 * Test the api_fr_photo_create_update() function.
-	 *
-	 * @return void
 	 * @expectedException Friendica\Network\HTTPException\BadRequestException
 	 */
 	public function testApiFrPhotoCreateUpdate()

tests/phpunit-local.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpunit
-	bootstrap="bootstrap.php"
-	verbose="true">
-	<testsuite name='friendica'>
-		<directory suffix='.php'>functional/</directory>
-		<directory suffix='.php'>include/</directory>
-		<directory suffix='.php'>src/</directory>
-		<directory suffix='.php'>./</directory>
-	</testsuite>
-	<!-- Filters for Code Coverage -->
-	<filter>
-		<whitelist>
-			<directory suffix=".php">..</directory>
-			<exclude>
-				<directory suffix=".php">config/</directory>
-				<directory suffix=".php">doc/</directory>
-				<directory suffix=".php">images/</directory>
-				<directory suffix=".php">library/</directory>
-				<directory suffix=".php">spec/</directory>
-				<directory suffix=".php">tests/</directory>
-				<directory suffix=".php">view/</directory>
-			</exclude>
-		</whitelist>
-	</filter>
-</phpunit>

tests/phpunit.xml

@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit
-	bootstrap="bootstrap.php"
-	verbose="true">
+		bootstrap="bootstrap.php"
+		verbose="true"
+		backupGlobals="false"
+		timeoutForSmallTests="900"
+		timeoutForMediumTests="900"
+		timeoutForLargeTests="900">
 	<testsuite name='friendica'>
 		<directory suffix='.php'>functional/</directory>
 		<directory suffix='.php'>include/</directory>
 		<directory suffix='.php'>src/</directory>
-		<directory suffix='.php'>./</directory>
 	</testsuite>
 	<!-- Filters for Code Coverage -->
 	<filter>
 		<whitelist>
 			<directory suffix=".php">..</directory>
 			<exclude>
-				<directory suffix=".php">../config</directory>
-				<directory suffix=".php">../doc</directory>
-				<directory suffix=".php">../images</directory>
-				<directory suffix=".php">../library</directory>
-				<directory suffix=".php">../spec</directory>
-				<directory suffix=".php">../tests</directory>
-				<directory suffix=".php">../view</directory>
+				<directory suffix=".php">config/</directory>
+				<directory suffix=".php">doc/</directory>
+				<directory suffix=".php">images/</directory>
+				<directory suffix=".php">library/</directory>
+				<directory suffix=".php">spec/</directory>
+				<directory suffix=".php">tests/</directory>
+				<directory suffix=".php">view/</directory>
+				<directory suffix=".php">vendor/</directory>
 			</exclude>
 		</whitelist>
 	</filter>
-	<listeners>
-		<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener" />
-	</listeners>
 </phpunit>

tests/src/App/ModeTest.php

@@ -53,7 +53,7 @@ class ModeTest extends MockedTest
 	 */
 	private $configCacheMock;
 
-	protected function setUp()
+	protected function setUp() : void
 	{
 		parent::setUp();
 

tests/src/App/RouterTest.php

@@ -40,7 +40,7 @@ class RouterTest extends TestCase
 	 */
 	private $cache;
 
-	protected function setUp()
+	protected function setUp() : void
 	{
 		parent::setUp();
 

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');
 

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();
 

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();
 

tests/src/Console/LockConsoleTest.php

@@ -40,7 +40,7 @@ class LockConsoleTest extends ConsoleTest
 	 */
 	private $lockMock;
 
-	protected function setUp()
+	protected function setUp() : void
 	{
 		parent::setUp();
 

tests/src/Console/ServerBlockConsoleTest.php

@@ -42,7 +42,7 @@ class ServerBlockConsoleTest extends ConsoleTest
 	 */
 	private $configMock;
 
-	protected function setUp()
+	protected function setUp() : void
 	{
 		parent::setUp();
 

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();

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();

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();

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();

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();

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();
@@ -40,6 +40,7 @@ class ArrayCacheTest extends MemoryCacheTest
 	public function testTTL()
 	{
 		// Array Cache doesn't support TTL
+		self::markTestSkipped("Array Cache doesn't support TTL");
 		return true;
 	}
 }

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();
 

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();
 	}
 }

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();

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();

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();
 

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();

tests/src/Core/Config/ConfigTest.php

@@ -55,7 +55,7 @@ abstract class ConfigTest extends MockedTest
 	}
 
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

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);
@@ -463,6 +472,7 @@ class InstallerTest extends MockedTest
 
 	/**
 	 * Test the setup of the config cache for installation
+	 * @doesNotPerformAssertions
 	 */
 	public function testSetUpCache()
 	{

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');

tests/src/Core/Lock/ArrayCacheLockTest.php

@@ -33,7 +33,6 @@ class ArrayCacheLockTest extends LockTest
 
 	public function testLockTTL()
 	{
-		// ArrayCache doesn't support TTL
-		return true;
+		self::markTestSkipped("ArrayCache doesn't support TTL");
 	}
 }

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();
+	}
 }

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();

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();
@@ -61,8 +61,7 @@ class SemaphoreLockTest extends LockTest
 
 	public function testLockTTL()
 	{
-		// Semaphore doesn't work with TTL
-		return true;
+		self::markTestSkipped("Semaphore doesn't work with TTL");
 	}
 
 	/**

tests/src/Core/PConfig/PConfigTest.php

@@ -57,7 +57,7 @@ abstract class PConfigTest extends MockedTest
 	}
 
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 

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);

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();
 

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();
 

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);

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();
+	}
 }

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();
 

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();
 

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();
 

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();
 

tests/src/Security/TwoFactor/Factory/TrustedBrowserTest.php

@@ -3,11 +3,12 @@
 namespace Friendica\Test\src\Security\TwoFactor\Factory;
 
 use Friendica\Security\TwoFactor\Factory\TrustedBrowser;
+use Friendica\Test\MockedTest;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Logger\VoidLogger;
 use Friendica\Util\Strings;
 
-class TrustedBrowserTest extends \PHPUnit_Framework_TestCase
+class TrustedBrowserTest extends MockedTest
 {
 	public function testCreateFromTableRowSuccess()
 	{

tests/src/Security/TwoFactor/Model/TrustedBrowserTest.php

@@ -3,10 +3,11 @@
 namespace Friendica\Test\src\Security\TwoFactor\Model;
 
 use Friendica\Security\TwoFactor\Model\TrustedBrowser;
+use Friendica\Test\MockedTest;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
-class TrustedBrowserTest extends \PHPUnit_Framework_TestCase
+class TrustedBrowserTest extends MockedTest
 {
 	public function test__construct()
 	{

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();
 

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
 	 *

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 = [];
 

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();
 

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();
 

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();
 

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();
 
@@ -52,6 +52,7 @@ class ProfilerLoggerTest extends MockedTest
 	/**
 	 * Test if the profiler is profiling data
 	 * @dataProvider dataTests
+	 * @doesNotPerformAssertions
 	 */
 	public function testProfiling($function, $message, array $context)
 	{
@@ -64,6 +65,7 @@ class ProfilerLoggerTest extends MockedTest
 
 	/**
 	 * Test the log() function
+	 * @doesNotPerformAssertions
 	 */
 	public function testProfilingLog()
 	{

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();
 

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');
@@ -95,6 +100,7 @@ class SyslogLoggerTest extends AbstractLoggerTest
 
 	/**
 	 * Test the close() method
+	 * @doesNotPerformAssertions
 	 */
 	public function testClose()
 	{

tests/src/Util/Logger/VoidLoggerTest.php

@@ -32,6 +32,7 @@ class VoidLoggerTest extends MockedTest
 	/**
 	 * Test if the profiler is profiling data
 	 * @dataProvider dataTests
+	 * @doesNotPerformAssertions
 	 */
 	public function testNormal($function, $message, array $context)
 	{
@@ -41,6 +42,7 @@ class VoidLoggerTest extends MockedTest
 
 	/**
 	 * Test the log() function
+	 * @doesNotPerformAssertions
 	 */
 	public function testProfilingLog()
 	{

tests/src/Util/ProfilerTest.php

@@ -35,7 +35,7 @@ class ProfilerTest extends MockedTest
 	 */
 	private $logger;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();