Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master php testing versions #275

Merged
merged 1 commit into from
Dec 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ sudo: false
dist: trusty
language: php
php:
- 7.1
- 7.2
- 7.3
- 7.4snapshot

addons:
mariadb: '10.1'
Expand All @@ -22,11 +22,11 @@ env:

matrix:
include:
- php: 7.2
- php: 7.3
env: DB=sqlite
- php: 7.2
- php: 7.3
env: DB=mysql
- php: 7.2
- php: 7.3
env: DB=pgsql
fast_finish: true

Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/AppTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class AppTest extends TestCase {

private $container;

public function setUp() {
protected function setUp(): void {
parent::setUp();
$app = new App('privacy');
$this->container = $app->getContainer();
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Controller/PageControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class PageControllerTest extends PHPUnit_Framework_TestCase {
private $controller;
private $userId = 'john';

public function setUp() {
protected function setUp(): void {
$request = $this->getMockBuilder('OCP\IRequest')->getMock();

$this->controller = new PageController(
Expand Down