Merge branch 'stable14' of https://github.com/nextcloud/files_downloa…

…dactivity into stable14 # Conflicts: # .drone.yml # .travis.yml # appinfo/info.xml
TimoKunze · Sep 15, 2018 · 891d61d · 891d61d
2 parents 35607d1 + 46fce3c
commit 891d61d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -8,7 +8,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-2
     environment:
       - APP_NAME=files_trackdownloads
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ php:
 
 env:
   global:
-    - CORE_BRANCH=master
+    - CORE_BRANCH=stable14
     - APP_NAME=files_trackdownloads
   matrix:
     - DB=sqlite

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -1,25 +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>files_trackdownloads</id>
 	<name>Activities for shared file downloads, visible to all admins</name>
+	<summary>Creates activities (visible to any administrator) for downloads of files that were shared with other users or a group.</summary>
 	<description>Creates activities (visible to any administrator) for downloads of files that were shared with other users or a group.</description>
+	<version>1.3.1</version>
 	<licence>AGPL</licence>
 	<author>Joas Schilling, Timo Kunze</author>
+	<namespace>FilesTrackDownloads</namespace>
+
+	<types>
+		<filesystem/>
+	</types>
 
 	<category>files</category>
 	<category>monitoring</category>
-	<screenshot>https://raw.githubusercontent.com/TimoKunze/files_trackdownloads/master/docs/screenshot.png</screenshot>
 
 	<website>https://github.com/timokunze/files_trackdownloads</website>
 	<bugs>https://github.com/timokunze/files_trackdownloads/issues</bugs>
 	<repository>https://github.com/timokunze/files_trackdownloads</repository>
 
-	<version>1.3.1</version>
-	<namespace>FilesTrackDownloads</namespace>
-
-	<types>
-		<filesystem/>
-	</types>
+	<screenshot>https://raw.githubusercontent.com/TimoKunze/files_trackdownloads/master/docs/screenshot.png</screenshot>
 
 	<dependencies>
 		<nextcloud min-version="14" max-version="14" />

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -31,7 +31,7 @@
 // Fix for "Autoload path not allowed: .../files_trackdownloads/tests/testcase.php"
 \OC_App::loadApp('files_trackdownloads');
 
-if(!class_exists('PHPUnit_Framework_TestCase')) {
+if(!class_exists('\PHPUnit\Framework\TestCase')) {
 	require_once('PHPUnit/Autoload.php');
 }