Update master php testing versions

nickvergessen · nickvergessen · commit 8d2ef6abeab4 · 2019-11-28T10:48:07.000+01:00
Signed-off-by: Joas Schilling &lt;coding@schilljs.com&gt;
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
 services:
   - mysql
   - postgresql
diff --git a/tests/AppInfo/ApplicationTest.php b/tests/AppInfo/ApplicationTest.php
@@ -64,7 +64,7 @@ class ApplicationTest extends TestCase {
 	/** @var \OCP\AppFramework\IAppContainer */
 	protected $container;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->app = new Application();
 		$this->container = $this->app->getContainer();
diff --git a/tests/ConsumerTest.php b/tests/ConsumerTest.php
@@ -47,7 +47,7 @@ class ConsumerTest extends TestCase {
 	/** @var \OCA\Activity\UserSettings */
 	protected $userSettings;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->deleteTestActivities();
 
@@ -90,7 +90,7 @@ protected function setUp() {
 			)));
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$this->deleteTestActivities();
 		parent::tearDown();
 	}
diff --git a/tests/Controller/APIv1Test.php b/tests/Controller/APIv1Test.php
@@ -49,7 +49,7 @@
 class APIv1Test extends TestCase {
 	protected $originalWEBROOT;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->cleanUp();
 
@@ -94,7 +94,7 @@ protected function setUp() {
 		}
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$this->cleanUp();
 		\OC::$WEBROOT = $this->originalWEBROOT;
 
diff --git a/tests/Controller/APIv2Test.php b/tests/Controller/APIv2Test.php
@@ -92,7 +92,7 @@ class APIv2Test extends TestCase {
 	/** @var APIv2 */
 	protected $controller;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->activityManager = $this->createMock(IManager::class);
@@ -113,7 +113,7 @@ protected function setUp() {
 		$this->overwriteService('AvatarManager', $this->avatarManager);
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 
 		$this->restoreService('AvatarManager');
 		parent::tearDown();
diff --git a/tests/Controller/ActivitiesTest.php b/tests/Controller/ActivitiesTest.php
@@ -54,7 +54,7 @@ class ActivitiesTest extends TestCase {
 	/** @var Activities */
 	protected $controller;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/Controller/FeedTest.php b/tests/Controller/FeedTest.php
@@ -64,7 +64,7 @@ class FeedTest extends TestCase {
 	/** @var Feed */
 	protected $controller;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->data = $this->createMock(Data::class);
diff --git a/tests/CurrentUserTest.php b/tests/CurrentUserTest.php
@@ -44,7 +44,7 @@ class CurrentUserTest extends TestCase {
 	/** @var \OCP\Share\IManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $shareManager;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder('OCP\IRequest')
diff --git a/tests/DataDeleteActivitiesTest.php b/tests/DataDeleteActivitiesTest.php
@@ -40,7 +40,7 @@ class DataDeleteActivitiesTest extends TestCase {
 	/** @var Data */
 	protected $data;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$activities = array(
@@ -74,7 +74,7 @@ protected function setUp() {
 		);
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$this->data->deleteActivities(array(
 			'type' => 'test',
 		));
diff --git a/tests/DataTest.php b/tests/DataTest.php
@@ -47,7 +47,7 @@ class DataTest extends TestCase {
 	/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	protected $session;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->activityLanguage = $activityLanguage = \OCP\Util::getL10N('activity', 'en');
@@ -61,7 +61,7 @@ protected function setUp() {
 		);
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$this->restoreService('UserSession');
 		parent::tearDown();
 	}
diff --git a/tests/FilesHooksTest.php b/tests/FilesHooksTest.php
@@ -62,7 +62,7 @@ class FilesHooksTest extends TestCase {
 	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
 	protected $urlGenerator;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->activityManager = $this->createMock(IManager::class);
diff --git a/tests/GroupHelperTest.php b/tests/GroupHelperTest.php
@@ -41,7 +41,7 @@ class GroupHelperTest extends TestCase {
 	/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
 	protected $l;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->l = $this->createMock(IL10N::class);
diff --git a/tests/HooksDeleteUserTest.php b/tests/HooksDeleteUserTest.php
@@ -36,7 +36,7 @@
  * @package OCA\Activity\Tests
  */
 class HooksDeleteUserTest extends TestCase {
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$activities = array(
@@ -75,7 +75,7 @@ protected function setUp() {
 		}
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$data = new Data(
 			$this->createMock(IManager::class),
 			\OC::$server->getDatabaseConnection(),
diff --git a/tests/MailQueueHandlerTest.php b/tests/MailQueueHandlerTest.php
@@ -80,7 +80,7 @@ class MailQueueHandlerTest extends TestCase {
 	/** @var IDateTimeFormatter|\PHPUnit_Framework_MockObject_MockObject */
 	protected $dateTimeFormatter;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$app = self::getUniqueID('MailQueueHandlerTest');
@@ -159,7 +159,7 @@ protected function setUp() {
 		);
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$query = \OC::$server->getDatabaseConnection()->prepare('DELETE FROM `*PREFIX*activity_mq` WHERE `amq_timestamp` < 500');
 		$query->execute();
 
diff --git a/tests/UserSettingsTest.php b/tests/UserSettingsTest.php
@@ -36,7 +36,7 @@ class UserSettingsTest extends TestCase {
 	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->activityManager = $this->createMock(IManager::class);
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/ViewInfoCacheTest.php b/tests/ViewInfoCacheTest.php
@@ -32,7 +32,7 @@ class ViewInfoCacheTest extends TestCase {
 	/** @var \OCA\Activity\ViewInfoCache|\PHPUnit_Framework_MockObject_MockObject */
 	protected $infoCache;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->view = $this->getMockBuilder('OC\Files\View')

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class ConsumerTest extends TestCase {`
`47`	`47`	`/** @var \OCA\Activity\UserSettings */`
`48`	`48`	`protected $userSettings;`
`49`	`49`
`50`		`- protected function setUp() {`
	`50`	`+ protected function setUp(): void {`
`51`	`51`	`parent::setUp();`
`52`	`52`	`$this->deleteTestActivities();`
`53`	`53`
`@@ -90,7 +90,7 @@ protected function setUp() {`
`90`	`90`	`)));`
`91`	`91`	`}`
`92`	`92`
`93`		`- protected function tearDown() {`
	`93`	`+ protected function tearDown(): void {`
`94`	`94`	`$this->deleteTestActivities();`
`95`	`95`	`parent::tearDown();`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`class APIv1Test extends TestCase {`
`50`	`50`	`protected $originalWEBROOT;`
`51`	`51`
`52`		`- protected function setUp() {`
	`52`	`+ protected function setUp(): void {`
`53`	`53`	`parent::setUp();`
`54`	`54`	`$this->cleanUp();`
`55`	`55`
`@@ -94,7 +94,7 @@ protected function setUp() {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- protected function tearDown() {`
	`97`	`+ protected function tearDown(): void {`
`98`	`98`	`$this->cleanUp();`
`99`	`99`	`\OC::$WEBROOT = $this->originalWEBROOT;`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class DataTest extends TestCase {`
`47`	`47`	`/** @var \OCP\IUserSession\|\PHPUnit_Framework_MockObject_MockObject */`
`48`	`48`	`protected $session;`
`49`	`49`
`50`		`- protected function setUp() {`
	`50`	`+ protected function setUp(): void {`
`51`	`51`	`parent::setUp();`
`52`	`52`
`53`	`53`	`$this->activityLanguage = $activityLanguage = \OCP\Util::getL10N('activity', 'en');`
`@@ -61,7 +61,7 @@ protected function setUp() {`
`61`	`61`	`);`
`62`	`62`	`}`
`63`	`63`
`64`		`- protected function tearDown() {`
	`64`	`+ protected function tearDown(): void {`
`65`	`65`	`$this->restoreService('UserSession');`
`66`	`66`	`parent::tearDown();`
`67`	`67`	`}`