Skip to content

Update master php testing versions #34

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Dec 16, 2019
Merged

Update master php testing versions #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3018948
Update master php testing versions
nickvergessen Dec 5, 2019
30a57ee
Merge branch 'master' into update-master-php-testing-versions
blizzz Dec 13, 2019
ee9330a
Merge branch 'master' into update-master-php-testing-versions
blizzz Dec 16, 2019
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
28 changes: 14 additions & 14 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ kind: pipeline
name: compatibility

steps:
- name: syntax-php7.1
image: nextcloudci/php7.1:php7.1-16
- name: syntax-php7.2
image: nextcloudci/php7.2:php7.2-13
environment:
APP_NAME: data_request
CORE_BRANCH: master
Expand All @@ -14,8 +14,8 @@ steps:
- cd ../server
- composer install
- ./lib/composer/bin/parallel-lint apps/$APP_NAME/
- name: syntax-php7.3
image: nextcloudci/php7.3:php7.3-1
- name: syntax-php7.4
image: nextcloudci/php7.4:2
environment:
APP_NAME: data_request
CORE_BRANCH: master
Expand All @@ -27,7 +27,7 @@ steps:
- composer install
- ./lib/composer/bin/parallel-lint apps/$APP_NAME/
- name: app-code-check
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: data_request
CORE_BRANCH: master
Expand All @@ -49,11 +49,11 @@ trigger:

---
kind: pipeline
name: unit-sqlite-php7.1
name: unit-sqlite-php7.2

steps:
- name: sqlite-php7.1
image: nextcloudci/php7.1:php7.1-16
- name: sqlite-php7.2
image: nextcloudci/php7.2:php7.2-13
environment:
APP_NAME: data_request
CORE_BRANCH: master
Expand All @@ -79,11 +79,11 @@ trigger:

---
kind: pipeline
name: unit-sqlite-php7.2
name: unit-sqlite-php7.3

steps:
- name: sqlite-php7.2
image: nextcloudci/php7.2:php7.2-12
- name: sqlite-php7.3
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: data_request
CORE_BRANCH: master
Expand All @@ -109,11 +109,11 @@ trigger:

---
kind: pipeline
name: unit-sqlite-php7.3
name: unit-sqlite-php7.4

steps:
- name: sqlite-php7.3
image: nextcloudci/php7.3:php7.3-1
- name: sqlite-php7.4
image: nextcloudci/php7.4:2
environment:
APP_NAME: data_request
CORE_BRANCH: master
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Controller/DataRequestControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class DataRequestControllerTest extends \Test\TestCase {
/** @var DataRequestController */
protected $controller;

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

$this->requestService = $this->createMock(Request::class);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Services/RequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class RequestTest extends \Test\TestCase {
/** @var Defaults|PHPUnit_Framework_MockObject_MockObject */
protected $defaults;

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

$this->groupManager = $this->createMock(IGroupManager::class);
Expand Down