Merge pull request #18064 from nextcloud/feature/php74

Add php7.4 support

9 files changed, 25 insertions, 25 deletions

diff --git a/apps/files/tests/Activity/Filter/GenericTest.php b/apps/files/tests/Activity/Filter/GenericTest.php
index f2b1acba3b3..8cae50c99c9 100644
--- a/apps/files/tests/Activity/Filter/GenericTest.php
+++ b/apps/files/tests/Activity/Filter/GenericTest.php
@@ -60,7 +60,7 @@ class GenericTest extends TestCase {
 	public function testGetIdentifier($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getIdentifier());
+		$this->assertIsString($filter->getIdentifier());
 	}
 
 	/**
@@ -70,7 +70,7 @@ class GenericTest extends TestCase {
 	public function testGetName($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getName());
+		$this->assertIsString($filter->getName());
 	}
 
 	/**
@@ -81,7 +81,7 @@ class GenericTest extends TestCase {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
 		$priority = $filter->getPriority();
-		$this->assertInternalType('int', $filter->getPriority());
+		$this->assertIsInt($filter->getPriority());
 		$this->assertGreaterThanOrEqual(0, $priority);
 		$this->assertLessThanOrEqual(100, $priority);
 	}
@@ -93,7 +93,7 @@ class GenericTest extends TestCase {
 	public function testGetIcon($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('string', $filter->getIcon());
+		$this->assertIsString($filter->getIcon());
 		$this->assertStringStartsWith('http', $filter->getIcon());
 	}
 
@@ -104,7 +104,7 @@ class GenericTest extends TestCase {
 	public function testFilterTypes($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('array', $filter->filterTypes([]));
+		$this->assertIsArray($filter->filterTypes([]));
 	}
 
 	/**
@@ -114,6 +114,6 @@ class GenericTest extends TestCase {
 	public function testAllowedApps($filterClass) {
 		/** @var IFilter $filter */
 		$filter = \OC::$server->query($filterClass);
-		$this->assertInternalType('array', $filter->allowedApps());
+		$this->assertIsArray($filter->allowedApps());
 	}
 }
diff --git a/apps/files/tests/Activity/ProviderTest.php b/apps/files/tests/Activity/ProviderTest.php
index d3738ae41a7..cb8a2175307 100644
--- a/apps/files/tests/Activity/ProviderTest.php
+++ b/apps/files/tests/Activity/ProviderTest.php
@@ -55,7 +55,7 @@ class ProviderTest extends TestCase {
 	/** @var IEventMerger|\PHPUnit_Framework_MockObject_MockObject */
 	protected $eventMerger;
 
-	public function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->l10nFactory = $this->createMock(IFactory::class);
@@ -136,10 +136,10 @@ class ProviderTest extends TestCase {
 		$this->assertSame('link-' . $id, $result['link']);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testGetFileThrows() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$provider = $this->getProvider();
 		self::invokePrivate($provider, 'getFile', ['/Foo/Bar.txt', null]);
 	}
diff --git a/apps/files/tests/Activity/Setting/GenericTest.php b/apps/files/tests/Activity/Setting/GenericTest.php
index a8df291cb80..e93919ffd4d 100644
--- a/apps/files/tests/Activity/Setting/GenericTest.php
+++ b/apps/files/tests/Activity/Setting/GenericTest.php
@@ -61,7 +61,7 @@ class GenericTest extends TestCase {
 	public function testGetIdentifier($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('string', $setting->getIdentifier());
+		$this->assertIsString($setting->getIdentifier());
 	}
 
 	/**
@@ -71,7 +71,7 @@ class GenericTest extends TestCase {
 	public function testGetName($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('string', $setting->getName());
+		$this->assertIsString($setting->getName());
 	}
 
 	/**
@@ -82,7 +82,7 @@ class GenericTest extends TestCase {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
 		$priority = $setting->getPriority();
-		$this->assertInternalType('int', $setting->getPriority());
+		$this->assertIsInt($setting->getPriority());
 		$this->assertGreaterThanOrEqual(0, $priority);
 		$this->assertLessThanOrEqual(100, $priority);
 	}
@@ -94,7 +94,7 @@ class GenericTest extends TestCase {
 	public function testCanChangeStream($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->canChangeStream());
+		$this->assertIsBool($setting->canChangeStream());
 	}
 
 	/**
@@ -104,7 +104,7 @@ class GenericTest extends TestCase {
 	public function testIsDefaultEnabledStream($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->isDefaultEnabledStream());
+		$this->assertIsBool($setting->isDefaultEnabledStream());
 	}
 
 	/**
@@ -114,7 +114,7 @@ class GenericTest extends TestCase {
 	public function testCanChangeMail($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->canChangeMail());
+		$this->assertIsBool($setting->canChangeMail());
 	}
 
 	/**
@@ -124,6 +124,6 @@ class GenericTest extends TestCase {
 	public function testIsDefaultEnabledMail($settingClass) {
 		/** @var ISetting $setting */
 		$setting = \OC::$server->query($settingClass);
-		$this->assertInternalType('bool', $setting->isDefaultEnabledMail());
+		$this->assertIsBool($setting->isDefaultEnabledMail());
 	}
 }
diff --git a/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php
index bf4e78d6b21..4b0496a1aa6 100644
--- a/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php
+++ b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php
@@ -38,7 +38,7 @@ class DeleteOrphanedItemsJobTest extends \Test\TestCase {
 	/** @var \OCP\IDBConnection */
 	protected $connection;
 
-	protected function setup() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->connection = \OC::$server->getDatabaseConnection();
 	}
diff --git a/apps/files/tests/BackgroundJob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php
index a75e54edfee..f4110cfbad0 100644
--- a/apps/files/tests/BackgroundJob/ScanFilesTest.php
+++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php
@@ -42,7 +42,7 @@ class ScanFilesTest extends TestCase {
 	/** @var ScanFiles */
 	private $scanFiles;
 
-	public function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/apps/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php
index 684192858e7..c3f7d8712ac 100644
--- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php
+++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php
@@ -55,7 +55,7 @@ class DeleteOrphanedFilesTest extends TestCase {
 	 */
 	private $user1;
 
-	protected function setup() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -68,7 +68,7 @@ class DeleteOrphanedFilesTest extends TestCase {
 		$this->command = new DeleteOrphanedFiles($this->connection);
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$userManager = \OC::$server->getUserManager();
 		$user1 = $userManager->get($this->user1);
 		if($user1) {
diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php
index 22daf7c23b4..bd27fc2537d 100644
--- a/apps/files/tests/Controller/ApiControllerTest.php
+++ b/apps/files/tests/Controller/ApiControllerTest.php
@@ -68,7 +68,7 @@ class ApiControllerTest extends TestCase {
 	/** @var Folder|\PHPUnit_Framework_MockObject_MockObject */
 	private $userFolder;
 
-	public function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder(IRequest::class)
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index 4de56082e98..0e109128c5b 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -76,7 +76,7 @@ class ViewControllerTest extends TestCase {
 	/** @var Helper|\PHPUnit_Framework_MockObject_MockObject */
 	private $activityHelper;
 
-	public function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
 		$this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)->getMock();
diff --git a/apps/files/tests/Service/TagServiceTest.php b/apps/files/tests/Service/TagServiceTest.php
index 709ba3b9c98..4590277aeb4 100644
--- a/apps/files/tests/Service/TagServiceTest.php
+++ b/apps/files/tests/Service/TagServiceTest.php
@@ -70,7 +70,7 @@ class TagServiceTest extends \Test\TestCase {
 	 */
 	private $tagger;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->user = static::getUniqueID('user');
 		$this->activityManager = $this->createMock(IManager::class);
@@ -112,7 +112,7 @@ class TagServiceTest extends \Test\TestCase {
 
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		\OC_User::setUserId('');
 		$user = \OC::$server->getUserManager()->get($this->user);
 		if ($user !== null) { $user->delete(); }