Test on PHP7.4, remove Firefox as dependency

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
This commit is contained in:
Georg Ehrke 2019-12-02 10:24:20 +01:00
parent 3b36d53aa7
commit 051df990d1
No known key found for this signature in database
GPG Key ID: 9D98FD9380A1CB43
8 changed files with 15 additions and 17 deletions

View File

@ -2,9 +2,9 @@ sudo: required
dist: trusty
language: php
php:
- 7.1
- 7.2
- 7.3
- 7.4snapshot
addons:
apt:
@ -13,7 +13,6 @@ addons:
- mysql-client-core-5.6
- mysql-client-5.6
- libxml2-utils
firefox: "latest"
branches:
only:
@ -29,18 +28,16 @@ env:
matrix:
include:
- php: 7.3
- php: 7.4snapshot
env: "TEST_SUITE=PACKAGE"
- php: 7.3
- php: 7.4snapshot
env: "TEST_SUITE=LINT-PHP"
- php: 7.3
- php: 7.4snapshot
env: "TEST_SUITE=TEST-JS"
- php: 7.3
env: "CORE_BRANCH=stable17"
- php: 7.2
env: "CORE_BRANCH=stable17"
- php: 7.1
env: "CORE_BRANCH=stable17"
fast_finish: true
cache:
@ -73,7 +70,7 @@ before_script:
- sh -c "if [ '$TEST_SUITE' = 'TEST-JS' ]; then make dev-setup; fi"
# XDebug is only needed if we report coverage -> speeds up other builds
- if [[ "$PHP_COVERAGE" = "FALSE" ]]; then phpenv config-rm xdebug.ini; fi
- if [[ "$PHP_COVERAGE" = "FALSE" ]]; then phpenv config-rm xdebug.ini || true; fi
script:
# Check info.xml schema validity

View File

@ -1,14 +1,15 @@
{
"config": {
"platform": {
"php": "7.1"
"php": "7.2"
}
},
"require": {
"php": ">=7.1"
"php": ">=7.2"
},
"require-dev": {
"phpunit/phpunit": "^6.5",
"christophwurst/nextcloud": "v17.0.1",
"christophwurst/nextcloud_testing": "0.9.1",
"phan/phan": "^2.0"
},
"scripts": {

View File

@ -25,7 +25,7 @@ namespace OCA\Calendar\Controller;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Contacts\IManager;
use OCP\IRequest;
use Test\TestCase;
use ChristophWurst\Nextcloud\Testing\TestCase;
class ContactControllerTest extends TestCase {

View File

@ -33,7 +33,7 @@ use OCP\IUserSession;
use OCP\Mail\IEMailTemplate;
use OCP\Mail\IMailer;
use OCP\Mail\IMessage;
use Test\TestCase;
use ChristophWurst\Nextcloud\Testing\TestCase;
class EmailControllerTest extends TestCase {

View File

@ -26,7 +26,7 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IURLGenerator;
use Test\TestCase;
use ChristophWurst\Nextcloud\Testing\TestCase;
class PublicViewControllerTest extends TestCase {

View File

@ -24,7 +24,7 @@ namespace OCA\Calendar\Controller;
use OCP\IConfig;
use OCP\IRequest;
use Test\TestCase;
use ChristophWurst\Nextcloud\Testing\TestCase;
class SettingsControllerTest extends TestCase {

View File

@ -25,7 +25,7 @@ namespace OCA\Calendar\Controller;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IRequest;
use Test\TestCase;
use ChristophWurst\Nextcloud\Testing\TestCase;
class ViewControllerTest extends TestCase {

View File

@ -26,7 +26,7 @@ use OCP\IConfig;
use OCP\IUser;
use OCP\IUserManager;
use OCP\Migration\IOutput;
use Test\TestCase;
use ChristophWurst\Nextcloud\Testing\TestCase;
class CurrentViewNameRepairStepTest extends TestCase {