Merge pull request #330 from nextcloud/php7.0-ci

PHP 7.0 CI

.drone.yml

@@ -8,38 +8,41 @@ build:
     commands:
       - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
       - git submodule update --init
-      - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
       - NOCOVERAGE=true ./autotest.sh sqlite
   sqlite-php5.5:
     image: nextcloudci/php5.5:1.0.7
     commands:
       - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
       - git submodule update --init
-      - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
       - NOCOVERAGE=true ./autotest.sh sqlite
-  sqlite:
+  sqlite-php5.6:
     image: nextcloudci/php5.6:1.0.6
     commands:
       - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
       - git submodule update --init
-      - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
-      - ./autotest.sh sqlite
-  mysql:
+      - NOCOVERAGE=true ./autotest.sh sqlite
+  sqlite-php7.0:
+    image: nextcloudci/php7.0:1.0.9
+    commands:
+      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
+      - git submodule update --init
+      - NOCOVERAGE=true ./autotest.sh sqlite
+  mysql-php5.6:
     image: nextcloudci/php5.6:1.0.6
     commands:
       - sleep 15 # gives the database enough time to initialize
       - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
       - git submodule update --init
-      - ./autotest.sh mysql
-  postgres:
+      - NOCOVERAGE=true ./autotest.sh mysql
+  postgres-php5.6:
     image: nextcloudci/php5.6:1.0.6
     commands:
       - sleep 10 # gives the database enough time to initialize
       - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
       - git submodule update --init
-      - ./autotest.sh pgsql
+      - NOCOVERAGE=true ./autotest.sh pgsql
   integration:
-    image: nextcloudci/php5.6:1.0.6
+    image: nextcloudci/php7.0:1.0.9
     commands:
       - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
       - git submodule update --init

tests/lib/PreviewTest.php

@@ -783,7 +783,7 @@ class PreviewTest extends TestCase {
 		$filename = $this->samples[$sampleId]['sampleFileName'];
 		$splitFileName = pathinfo($filename);
 		$extension = $splitFileName['extension'];
-		$correction = ($extension === 'eps') ? 1 : 0;
+		$correction = ($extension === 'eps' && PHP_MAJOR_VERSION < 7) ? 1 : 0;
 		$maxPreviewHeight = $this->samples[$sampleId]['maxPreviewHeight'];
 		$maxPreviewHeight = $maxPreviewHeight - $correction;
 

tests/lib/Traits/MountProviderTrait.php

@@ -41,7 +41,7 @@ trait MountProviderTrait {
 
 	protected function setUpMountProviderTrait() {
 		$this->storageFactory = new StorageFactory();
-		$this->mountProvider = $this->getMock('\OCP\Files\Config\IMountProvider');
+		$this->mountProvider = $this->getMockBuilder('\OCP\Files\Config\IMountProvider')->getMock();
 		$this->mountProvider->expects($this->any())
 			->method('getMountsForUser')
 			->will($this->returnCallback(function (IUser $user) {