diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-10 13:46:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-10 13:46:59 +0200 |
| commit | 3c30ca826044213c76b00e3120f98f6821835ef3 (patch) | |
| tree | 33cf76d15bd14a8bad0c33d69aa4e22b00de7913 | |
| parent | 4aae15708703784e4d52a7fd59d2cda6dbf5d361 (diff) | |
| parent | aab741e4a0a0d09e73ddd2d371cf0ed18103da44 (diff) | |
| download | nextcloud-server-3c30ca826044213c76b00e3120f98f6821835ef3.tar.gz nextcloud-server-3c30ca826044213c76b00e3120f98f6821835ef3.zip | |
Merge pull request #330 from nextcloud/php7.0-ci
PHP 7.0 CI
| -rw-r--r-- | .drone.yml | 23 | ||||
| -rw-r--r-- | tests/lib/PreviewTest.php | 2 | ||||
| -rw-r--r-- | tests/lib/Traits/MountProviderTrait.php | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/.drone.yml b/.drone.yml index 07ad955acfa..2b17ba42f77 100644 --- a/.drone.yml +++ b/.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 diff --git a/tests/lib/PreviewTest.php b/tests/lib/PreviewTest.php index 6ca88253468..cd228801815 100644 --- a/tests/lib/PreviewTest.php +++ b/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; diff --git a/tests/lib/Traits/MountProviderTrait.php b/tests/lib/Traits/MountProviderTrait.php index bccb5b693ee..0437157e84f 100644 --- a/tests/lib/Traits/MountProviderTrait.php +++ b/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) { |