Update master php testing versions

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Dec 4, 2019 · b8eaec1 · b8eaec1
1 parent d925ad8
commit b8eaec1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -3,7 +3,7 @@ name: app-compatbility
 
 steps:
 - name: check-app-compatbility
-  image: nextcloudci/php7.1:php7.1-16
+  image: nextcloudci/php7.3:php7.3-5
   environment:
     APP_NAME: firstrunwizard
     CORE_BRANCH: master
@@ -29,11 +29,11 @@ trigger:
 
 ---
 kind: pipeline
-name: php7.1
+name: php7.2
 
 steps:
-- name: php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: php7.2
+  image: nextcloudci/php7.2:php7.2-13
   environment:
     APP_NAME: firstrunwizard
     CORE_BRANCH: master
@@ -57,11 +57,11 @@ trigger:
 
 ---
 kind: pipeline
-name: php7.2
+name: php7.3
 
 steps:
-- name: php7.2
-  image: nextcloudci/php7.2:php7.2-9
+- name: php7.3
+  image: nextcloudci/php7.3:php7.3-5
   environment:
     APP_NAME: firstrunwizard
     CORE_BRANCH: master
@@ -71,7 +71,7 @@ steps:
     - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
     - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/
-    - php occ app:enable firstrunwizard
+    - php occ app:enable $APP_NAME
     - cd apps/$APP_NAME
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 
@@ -85,11 +85,11 @@ trigger:
 
 ---
 kind: pipeline
-name: php7.3
+name: php7.4
 
 steps:
-- name: php7.3
-  image: nextcloudci/php7.3:php7.3-2
+- name: php7.4
+  image: nextcloudci/php7.4:2
   environment:
     APP_NAME: firstrunwizard
     CORE_BRANCH: master
@@ -99,7 +99,7 @@ steps:
     - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
     - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/
-    - php occ app:enable firstrunwizard
+    - php occ app:enable $APP_NAME
     - cd apps/$APP_NAME
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 
@@ -137,4 +137,4 @@ trigger:
     - stable*
   event:
     - pull_request
-    - push
+    - push
diff --git a/tests/Controller/WizardControllerTest.php b/tests/Controller/WizardControllerTest.php
@@ -45,7 +45,7 @@ class WizardControllerTest extends TestCase {
 	protected $config;
 	private $groupManager;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);

diff --git a/tests/Notification/BackgroundJobTest.php b/tests/Notification/BackgroundJobTest.php
@@ -42,7 +42,7 @@ class BackgroundJobTest extends TestCase {
 	/** @var BackgroundJob */
 	protected $job;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->notificationManager = $this->createMock(IManager::class);
 		$this->job = new BackgroundJob(

diff --git a/tests/Notification/NotifierTest.php b/tests/Notification/NotifierTest.php
@@ -50,7 +50,7 @@ class NotifierTest extends TestCase {
 	/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
 	protected $l;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->manager = $this->createMock(IManager::class);