Merge pull request #492 from nextcloud/update-master-php-testing-versions

Update master php testing versions

Author: rullzer

.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

tests/Integration/app/appinfo/info.xml

@@ -1,20 +1,27 @@
 <?xml version="1.0"?>
-<info>
+<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
+	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>notificationsintegrationtesting</id>
 	<name>Notifications Integration Testing</name>
-	<namespace>NotificationsIntegrationTesting</namespace>
-	<description/>
+	<summary><![CDATA[1]]></summary>
+	<description><![CDATA[2]]></description>
 
-	<licence>AGPL</licence>
-	<author>Joas Schilling</author>
 	<version>0.2.3</version>
+	<licence>agpl</licence>
+	<author>Joas Schilling</author>
+	<namespace>NotificationsIntegrationTesting</namespace>
 
 	<types>
 		<logging/>
 	</types>
 
+	<category>tools</category>
+
+	<website>https://github.com/nextcloud/notifications</website>
+	<bugs>https://github.com/nextcloud/notifications/issues</bugs>
+	<repository>https://github.com/nextcloud/notifications.git</repository>
+
 	<dependencies>
-		<owncloud min-version="9.0" />
-		<owncloud max-version="9.2" />
+		<nextcloud min-version="18" max-version="18" />
 	</dependencies>
 </info>

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

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

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

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

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 */

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

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

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(