fix travis (#20)

* remove oc travis stuff

* Fix integration tests and bump max-version

* Fix stable11 and stable9

* Add stable12

12 files changed, 36 insertions, 115 deletions

diff --git a/.travis.yml b/.travis.yml
index 7700e56..78c6bac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ services:
 env:
   global:
     - BRANCH=master
-    - REPO=oc
+    - REPO=nc
   matrix:
     - DB=mysql
 
@@ -20,25 +20,13 @@ matrix:
     - php: 5.6
       env: DB=pgsql
     - php: 5.6
-      env: DB=mysql BRANCH=stable8
-    - php: 5.6
-      env: DB=mysql BRANCH=stable8.1
-    - php: 5.6
-      env: DB=mysql BRANCH=stable8.2
-    - php: 5.6
       env: DB=mysql BRANCH=stable9
     - php: 5.6
-      env: DB=mysql BRANCH=stable9.1
-    - php: 5.4
-      env: DB=mysql BRANCH=stable9.1
-    - php: 5.5
-      env: DB=mysql BRANCH=stable9.1
-    - php: 5.6
-      env: DB=mysql BRANCH=stable9 REPO=nc
+      env: DB=mysql BRANCH=stable10
     - php: 5.6
-      env: DB=mysql BRANCH=stable10 REPO=nc
+      env: DB=mysql BRANCH=stable11
     - php: 5.6
-      env: DB=mysql BRANCH=master REPO=nc
+      env: DB=mysql BRANCH=stable12
 
 
 
@@ -47,6 +35,6 @@ install: ./tests/travis/install-$REPO-$BRANCH.sh
 # Note the install script should make sure we are in the apps/ojsxc directory
 script:
   - composer install
-  - phpunit -c phpunit.xml
-  - phpunit -c phpunit.integration.xml
-  - cat ../../data/owncloud.log || cat ../../data/nextcloud.log
+  - ./vendor/bin/phpunit -c phpunit.xml
+  - ./vendor/bin/phpunit -c phpunit.integration.xml
+  - cat ../../data/nextcloud.log  || cat ../../data/owncloud.log # in stable9 the log file is still called owncloud.log
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 15a2349..27ca766 100755
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -38,7 +38,7 @@
       <lib>xmlwriter</lib>
       <lib>dom</lib>
       <owncloud min-version="8.0" max-version="9"/>
-      <nextcloud min-version="9" max-version="12"/>
+      <nextcloud min-version="9" max-version="13"/>
    </dependencies>
 
    <ocsid>162257</ocsid>
diff --git a/tests/integration/DbLockTest.php b/tests/integration/DbLockTest.php
index f378537..d157b48 100644
--- a/tests/integration/DbLockTest.php
+++ b/tests/integration/DbLockTest.php
@@ -33,6 +33,12 @@ class DbLockTest extends TestCase {
 	 */
 	private $con;
 
+
+	/**
+	 * @var \OCP\AppFramework\IAppContainer
+	 */
+	private $container;
+
 	public function setUp() {
 		parent::setUp();
 		$app = new Application();
@@ -50,8 +56,8 @@ class DbLockTest extends TestCase {
 		$time = 4;
 		$this->dbLock = new DbLock(
 			'john',
-			$this->container->getServer()->getDb(),
-			$this->container->getServer()->getConfig()
+			$this->container->getServer()->getConfig(),
+			$this->container->getServer()->getDatabaseConnection()
 		);
 		$this->dbLock->setLock();
 		$result = $this->fetchLocks();
@@ -66,8 +72,8 @@ class DbLockTest extends TestCase {
 		$time = 5;
 		$this->dbLock2 = new DbLock(
 			'john',
-			$this->container->getServer()->getDb(),
-			$this->container->getServer()->getConfig()
+			$this->container->getServer()->getConfig(),
+			$this->container->getServer()->getDatabaseConnection()
 		); // simulate new lock/request
 		$this->dbLock2->setLock();
 
diff --git a/tests/travis/install-nc-master.sh b/tests/travis/install-nc-master.sh
index 32ddc08..4896935 100755
--- a/tests/travis/install-nc-master.sh
+++ b/tests/travis/install-nc-master.sh
@@ -5,11 +5,11 @@ createuser -U travis -s oc_autotest
 mysql -e 'create database oc_autotest;'
 mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
 mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
+# install nextcloud
 cd ..
 #ncdev setup core --dir owncloud --branch $BRANCH --no-history
 git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $BRANCH nextcloud
-mv jsxc.chat nextcloud/apps/ojsxc
+mv jsxc.nextcloud nextcloud/apps/ojsxc
 phpenv config-add nextcloud/apps/ojsxc/tests/travis/php.ini
 cd nextcloud
 ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
diff --git a/tests/travis/install-nc-stable10.sh b/tests/travis/install-nc-stable10.sh
index 32ddc08..4896935 100755
--- a/tests/travis/install-nc-stable10.sh
+++ b/tests/travis/install-nc-stable10.sh
@@ -5,11 +5,11 @@ createuser -U travis -s oc_autotest
 mysql -e 'create database oc_autotest;'
 mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
 mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
+# install nextcloud
 cd ..
 #ncdev setup core --dir owncloud --branch $BRANCH --no-history
 git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $BRANCH nextcloud
-mv jsxc.chat nextcloud/apps/ojsxc
+mv jsxc.nextcloud nextcloud/apps/ojsxc
 phpenv config-add nextcloud/apps/ojsxc/tests/travis/php.ini
 cd nextcloud
 ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
diff --git a/tests/travis/install-oc-stable9.sh b/tests/travis/install-nc-stable11.sh
index 4189ede..4896935 100755
--- a/tests/travis/install-oc-stable9.sh
+++ b/tests/travis/install-nc-stable11.sh
@@ -1,17 +1,17 @@
 #!/bin/bash -x
-# install ocdev
 # set up postgresql
 createuser -U travis -s oc_autotest
 # set up mysql
 mysql -e 'create database oc_autotest;'
 mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
 mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
+# install nextcloud
 cd ..
-git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $BRANCH owncloud
-mv jsxc.chat owncloud/apps/ojsxc
-phpenv config-add owncloud/apps/ojsxc/tests/travis/php.ini
-cd owncloud
+#ncdev setup core --dir owncloud --branch $BRANCH --no-history
+git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $BRANCH nextcloud
+mv jsxc.nextcloud nextcloud/apps/ojsxc
+phpenv config-add nextcloud/apps/ojsxc/tests/travis/php.ini
+cd nextcloud
 ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
 ./occ app:enable ojsxc
 cd apps/ojsxc
diff --git a/tests/travis/install-oc-stable8.2.sh b/tests/travis/install-nc-stable12.sh
index 4189ede..4896935 100755
--- a/tests/travis/install-oc-stable8.2.sh
+++ b/tests/travis/install-nc-stable12.sh
@@ -1,17 +1,17 @@
 #!/bin/bash -x
-# install ocdev
 # set up postgresql
 createuser -U travis -s oc_autotest
 # set up mysql
 mysql -e 'create database oc_autotest;'
 mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
 mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
+# install nextcloud
 cd ..
-git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $BRANCH owncloud
-mv jsxc.chat owncloud/apps/ojsxc
-phpenv config-add owncloud/apps/ojsxc/tests/travis/php.ini
-cd owncloud
+#ncdev setup core --dir owncloud --branch $BRANCH --no-history
+git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $BRANCH nextcloud
+mv jsxc.nextcloud nextcloud/apps/ojsxc
+phpenv config-add nextcloud/apps/ojsxc/tests/travis/php.ini
+cd nextcloud
 ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
 ./occ app:enable ojsxc
 cd apps/ojsxc
diff --git a/tests/travis/install-nc-stable9.sh b/tests/travis/install-nc-stable9.sh
index 32ddc08..4896935 100755
--- a/tests/travis/install-nc-stable9.sh
+++ b/tests/travis/install-nc-stable9.sh
@@ -5,11 +5,11 @@ createuser -U travis -s oc_autotest
 mysql -e 'create database oc_autotest;'
 mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
 mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
+# install nextcloud
 cd ..
 #ncdev setup core --dir owncloud --branch $BRANCH --no-history
 git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $BRANCH nextcloud
-mv jsxc.chat nextcloud/apps/ojsxc
+mv jsxc.nextcloud nextcloud/apps/ojsxc
 phpenv config-add nextcloud/apps/ojsxc/tests/travis/php.ini
 cd nextcloud
 ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
diff --git a/tests/travis/install-oc-master.sh b/tests/travis/install-oc-master.sh
deleted file mode 100755
index 7dceca6..0000000
--- a/tests/travis/install-oc-master.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -x
-# set up postgresql
-createuser -U travis -s oc_autotest
-# set up mysql
-mysql -e 'create database oc_autotest;'
-mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
-mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
-cd ..
-git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $BRANCH owncloud
-mv jsxc.chat owncloud/apps/ojsxc
-phpenv config-add owncloud/apps/ojsxc/tests/travis/php.ini
-cd owncloud
-make
-./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
-./occ app:enable ojsxc
-
-# before_script:
-./occ config:import apps/ojsxc/tests/travis/config-redis.json
-cd apps/ojsxc
diff --git a/tests/travis/install-oc-stable8.1.sh b/tests/travis/install-oc-stable8.1.sh
deleted file mode 100755
index 0047759..0000000
--- a/tests/travis/install-oc-stable8.1.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -x
-# set up postgresql
-createuser -U travis -s oc_autotest
-# set up mysql
-mysql -e 'create database oc_autotest;'
-mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
-mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
-cd ..
-git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $BRANCH owncloud
-mv jsxc.chat owncloud/apps/ojsxc
-phpenv config-add owncloud/apps/ojsxc/tests/travis/php.ini
-cd owncloud
-./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
-./occ app:enable ojsxc
-cd apps/ojsxc
\ No newline at end of file
diff --git a/tests/travis/install-oc-stable8.sh b/tests/travis/install-oc-stable8.sh
deleted file mode 100755
index 29b00c0..0000000
--- a/tests/travis/install-oc-stable8.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -x
-# install ocdev
-# set up postgresql
-createuser -U travis -s oc_autotest
-# set up mysql
-mysql -e 'create database oc_autotest;'
-mysql -u root -e "CREATE USER 'oc_autotest'@'localhost';"
-mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
-cd ..
-git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $BRANCH owncloud
-cd owncloud
-cp -r ../jsxc.chat/tests/travis/autoconfig-stable8-mysql.php config/autoconfig.php
-php -f index.php
-#enable ojsxc
-mv ../jsxc.chat apps/ojsxc
-php -f console.php app:enable ojsxc
-
-cd apps/ojsxc
-
diff --git a/tests/travis/install-oc-stable9.1.sh b/tests/travis/install-oc-stable9.1.sh
deleted file mode 100755
index 4189ede..0000000
--- a/tests/travis/install-oc-stable9.1.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -x
-# install ocdev
-# set up postgresql
-createuser -U travis -s oc_autotest
-# set up mysql
-mysql -e 'create database oc_autotest;'
-mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
-mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-# install owncloud
-cd ..
-git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $BRANCH owncloud
-mv jsxc.chat owncloud/apps/ojsxc
-phpenv config-add owncloud/apps/ojsxc/tests/travis/php.ini
-cd owncloud
-./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
-./occ app:enable ojsxc
-cd apps/ojsxc