Skip to content
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
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php
php:
- 7.1
- 7.2
- 7.3
- 7.4snapshot
services:
- mysql
- postgresql
Expand Down Expand Up @@ -53,13 +53,13 @@ script:

matrix:
include:
- php: 7.1
- php: 7.3
env: DB=mysql
- php: 7.1
- php: 7.3
env: DB=pgsql
- php: 7.1
- php: 7.3
env: DB=mysql;CODECHECK=1
- php: 7.1
- php: 7.3
env: DB=mysql;CODECHECK=2
allow_failures:
- env: DB=mysql;CODECHECK=2
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Controller/RequestHandlerControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class RequestHandlerControllerTest extends TestCase {
/** @var string */
private $invalidCSR = "-----BEGIN CERTIFICATE REQUEST-----\nMIIC7jCCAdYCAQAwgagxCzAJBgNVBAYTAlVLMREwDwYDVQQIDAhTb21lcnNldDEU\nMBIGA1UEBwwLR2xhc3RvbmJ1cnkxHzAdBgNVBAoMFlRoZSBCcmFpbiBSb29tIExp\nbWl0ZWQxHzAdBgNVBAsMFlBIUCBEb2N1bWVudGF0aW9uIFRlYW0xDjAMBgNVBAMM\nBWFkbWluMR4wHAYJKoZIhvcNAQkBFg93ZXpAZXhhbXBsZS5jb20wggEiMA0GCSqG\nSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHWU8rWlK3lud%2Fr5OQoilxypgIzbBf5pqM\nH0rpYwFv3uctnK5Lt3M%2BWY45XdJt98Pq8eQ0AbyAf3IuhnpF%2BX2Ej3QnCenZ0H%2BB\nJ6%2FmZXdo9f7IXa2wH5LtA2cmm1XWQWubN%2FJzr9psq%2BkxbocyGTQhNGeeB2OPcgyl\n73eddJNIbFVlNEzbdcBNNsSwKcB%2BLP%2FJyJ9e1HZ4af6CHdX2SG1HvO%2BdICdEuO2E\nmC9lM896MJFWwNns5mx453Y1FmxFmAi1zQAAP%2BAZ5Taqy6yCzqJ9Y4%2FFDRi1NC5V\nstnu9REuPYSS8YgsJwQE%2FDUd%2BI%2BUonkcDfac8PIH5p5YHpMq0ChvAgMBAAGgADAN\nBgkqhkiG9w0BAQUFAAOCAQEAh8YVAsAcPR5v7kv96UtkVI4xK6R9BdmVsnisxTpm\ng9JVbfji7kpxbSgXfRSozTG3bl9ynrck39%2F2SoFQGSGrW2iV%2BdrclftSk%2BuBFb1F\niXYEWJxYSz2CcUeijoBrBsarfmODgOHzmgXmCoOToz2DkdtM7g9INWkC06Do4pTQ\nfqA3PS2td1gWqQCQthF9IWOCIxNI16lokVTgNCZKewXsn9Bjm3hsLLeJU9jBXyVN\nw7829dr37SuA2kQb86aVpqdL50v3HjCclXd7PfWiYqajuHaIsokBV5ly2IdQo4Cz\nAYzYQFPtjsDZ4Tju4VZKM4YpF2GwQgT7zhzDBvywGPqvfw%3D%3D\n-----END+CERTIFICATE+REQUEST-----\n";

public function setUp() {
protected function setUp(): void {
parent::setUp();

$this->request = $this->createMock(IRequest::class);
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/EncryptionManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class EncryptionManagerTest extends TestCase {
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
private $userSession;

public function setUp() {
protected function setUp(): void {
parent::setUp();
$this->rootFolderInterface = $this->createMock(IRootFolder::class);
$this->rootFolder = $this->getMockBuilder(Folder::class)->disableOriginalConstructor()->getMock();
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/LockManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class LockManagerTest extends TestCase {
/** @var IDBConnection */
private $connection;

public function setUp() {
protected function setUp(): void {
parent::setUp();

$this->connection = \OC::$server->getDatabaseConnection();
Expand Down