diff --git a/.travis.yml b/.travis.yml index 7bee5f5ee..0c75f6ade 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ dist: trusty sudo: required language: php php: - - 7.1 - 7.2 - 7.3 + - 7.4snapshot services: - mysql - postgresql @@ -23,7 +23,7 @@ cache: env: global: - - CORE_BRANCH=master + - CORE_BRANCH=bugfix/noid/broken-oracle-install - APP_NAME=notifications matrix: - DB=sqlite @@ -34,7 +34,7 @@ branches: - /^stable\d+(\.\d+)?$/ before_install: - - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/oracle-support/before_install.sh - . ./before_install.sh $APP_NAME $CORE_BRANCH $DB - sh -c "if [ -f ../server/data/nextcloud.log ]; then cat ../server/data/nextcloud.log; fi" @@ -72,17 +72,17 @@ script: matrix: include: - - php: 7.1 + - php: 7.3 env: DB=mysql - - php: 7.1 + - php: 7.3 env: DB=pgsql - - php: 7.1 + - php: 7.3 env: DB=oracle - - php: 7.1 + - php: 7.3 env: DB=mysql;CODECHECK=1 - - php: 7.1 + - php: 7.3 env: DB=mysql;CODECHECK=2 - - php: 7.1 + - php: 7.2 env: DB=mysql;INTEGRATION=1 allow_failures: - env: DB=mysql;CODECHECK=2 diff --git a/tests/Integration/app/appinfo/info.xml b/tests/Integration/app/appinfo/info.xml index 04ef87062..58cca602d 100644 --- a/tests/Integration/app/appinfo/info.xml +++ b/tests/Integration/app/appinfo/info.xml @@ -1,20 +1,27 @@ - + notificationsintegrationtesting Notifications Integration Testing - NotificationsIntegrationTesting - + + - AGPL - Joas Schilling 0.2.3 + agpl + Joas Schilling + NotificationsIntegrationTesting + tools + + https://github.com/nextcloud/notifications + https://github.com/nextcloud/notifications/issues + https://github.com/nextcloud/notifications.git + - - + diff --git a/tests/Unit/AppInfo/AppTest.php b/tests/Unit/AppInfo/AppTest.php index c3da469cc..2795bd0b5 100644 --- a/tests/Unit/AppInfo/AppTest.php +++ b/tests/Unit/AppInfo/AppTest.php @@ -44,7 +44,7 @@ class AppTest extends TestCase { /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ protected $session; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->manager = $this->createMock(IManager::class); @@ -56,7 +56,7 @@ protected function setUp() { $this->overwriteService('UserSession', $this->session); } - protected function tearDown() { + protected function tearDown(): void { $this->restoreService('NotificationManager'); $this->restoreService('Request'); $this->restoreService('UserSession'); diff --git a/tests/Unit/AppInfo/ApplicationTest.php b/tests/Unit/AppInfo/ApplicationTest.php index 652de2607..b4d0059eb 100644 --- a/tests/Unit/AppInfo/ApplicationTest.php +++ b/tests/Unit/AppInfo/ApplicationTest.php @@ -47,7 +47,7 @@ class ApplicationTest extends TestCase { /** @var 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/Unit/AppTest.php b/tests/Unit/AppTest.php index f1e49f037..8a5ec9b82 100644 --- a/tests/Unit/AppTest.php +++ b/tests/Unit/AppTest.php @@ -39,7 +39,7 @@ class AppTest extends TestCase { /** @var App */ protected $app; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->handler = $this->createMock(Handler::class); diff --git a/tests/Unit/Command/GenerateTest.php b/tests/Unit/Command/GenerateTest.php index 093a3457d..3f868153c 100644 --- a/tests/Unit/Command/GenerateTest.php +++ b/tests/Unit/Command/GenerateTest.php @@ -48,7 +48,7 @@ class GenerateTest extends \Test\TestCase { /** @var Generate */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->timeFactory = $this->createMock(ITimeFactory::class); diff --git a/tests/Unit/Controller/APIControllerTest.php b/tests/Unit/Controller/APIControllerTest.php index 72ad97633..d83b807ca 100644 --- a/tests/Unit/Controller/APIControllerTest.php +++ b/tests/Unit/Controller/APIControllerTest.php @@ -49,7 +49,7 @@ class APIControllerTest extends \Test\TestCase { /** @var APIController */ protected $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */ diff --git a/tests/Unit/Controller/EndpointControllerTest.php b/tests/Unit/Controller/EndpointControllerTest.php index 4df6ffb6f..1fece7fc3 100644 --- a/tests/Unit/Controller/EndpointControllerTest.php +++ b/tests/Unit/Controller/EndpointControllerTest.php @@ -63,7 +63,7 @@ class EndpointControllerTest extends TestCase { /** @var Push|MockObject */ protected $push; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Unit/Controller/PushControllerTest.php b/tests/Unit/Controller/PushControllerTest.php index 2d2401dc1..acdb0b2da 100644 --- a/tests/Unit/Controller/PushControllerTest.php +++ b/tests/Unit/Controller/PushControllerTest.php @@ -108,7 +108,7 @@ class PushControllerTest extends TestCase { '; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Unit/HandlerTest.php b/tests/Unit/HandlerTest.php index 6cc1a05cd..f56b2cf53 100644 --- a/tests/Unit/HandlerTest.php +++ b/tests/Unit/HandlerTest.php @@ -38,7 +38,7 @@ class HandlerTest extends TestCase { /** @var Handler */ protected $handler; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->handler = new Handler( diff --git a/tests/Unit/Notifier/NotifierTest.php b/tests/Unit/Notifier/NotifierTest.php index f45a6a622..599a7a0d2 100644 --- a/tests/Unit/Notifier/NotifierTest.php +++ b/tests/Unit/Notifier/NotifierTest.php @@ -40,7 +40,7 @@ class NotifierTest extends \Test\TestCase { /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ protected $l; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->urlGenerator = $this->createMock(IURLGenerator::class); diff --git a/tests/Unit/PushTest.php b/tests/Unit/PushTest.php index 00bb68a47..d54aa4a17 100644 --- a/tests/Unit/PushTest.php +++ b/tests/Unit/PushTest.php @@ -64,7 +64,7 @@ class PushTest extends TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->db = \OC::$server->getDatabaseConnection();