diff --git a/.drone.star b/.drone.star index 0afd27c0..8384b8ae 100644 --- a/.drone.star +++ b/.drone.star @@ -14,25 +14,16 @@ config = { "branches": [ "master", ], - "codestyle": { - "ordinary": { - "phpVersions": [ - "7.2", - "7.3", - "7.4", - ], - }, - }, + "codestyle": True, "javascript": True, "phpunit": { "allDatabases": { "phpVersions": [ - "7.2", + "7.3", ], }, "reducedDatabases": { "phpVersions": [ - "7.3", "7.4", ], "databases": [ @@ -44,12 +35,11 @@ config = { "phpintegration": { "allDatabases": { "phpVersions": [ - "7.2", + "7.3", ], }, "reducedDatabases": { "phpVersions": [ - "7.3", "7.4", ], "databases": [ @@ -144,7 +134,7 @@ def codestyle(ctx): return pipelines default = { - "phpVersions": ["7.2"], + "phpVersions": ["7.3"], } if "defaults" in config: @@ -309,7 +299,7 @@ def phpstan(ctx): return pipelines default = { - "phpVersions": ["7.2"], + "phpVersions": ["7.3"], "logLevel": "2", "extraApps": {}, "enableApp": True, @@ -386,7 +376,7 @@ def phan(ctx): return pipelines default = { - "phpVersions": ["7.2", "7.3", "7.4"], + "phpVersions": ["7.3", "7.4"], } if "defaults" in config: @@ -457,7 +447,7 @@ def build(ctx): return pipelines default = { - "phpVersions": ["7.2"], + "phpVersions": ["7.3"], "commands": [ "make dist", ], @@ -656,7 +646,7 @@ def phpTests(ctx, testType, withCoverage): errorFound = False default = { - "phpVersions": ["7.2", "7.3", "7.4"], + "phpVersions": ["7.3", "7.4"], "databases": [ "sqlite", "mariadb:10.2", @@ -853,7 +843,7 @@ def acceptance(ctx): default = { "servers": ["daily-master-qa", "latest"], "browsers": ["chrome"], - "phpVersions": ["7.2"], + "phpVersions": ["7.4"], "databases": ["mariadb:10.2"], "esVersions": ["none"], "federatedServerNeeded": False, @@ -934,7 +924,7 @@ def acceptance(ctx): params["extraSetup"] = [ { "name": "configure-app", - "image": "owncloudci/php:7.2", + "image": "owncloudci/php:7.4", "pull": "always", "commands": [ "cd /var/www/owncloud/server/apps/files_primary_s3", @@ -1698,7 +1688,7 @@ def setupCeph(serviceParams): return [{ "name": "setup-ceph", - "image": "owncloudci/php:7.2", + "image": "owncloudci/php:7.4", "pull": "always", "commands": setupCommands + ([ "./apps/files_primary_s3/tests/drone/create-bucket.sh", @@ -1726,7 +1716,7 @@ def setupScality(serviceParams): return [{ "name": "setup-scality", - "image": "owncloudci/php:7.2", + "image": "owncloudci/php:7.4", "pull": "always", "commands": setupCommands + ([ "php occ s3:create-bucket owncloud --accept-warning", @@ -1741,7 +1731,7 @@ def setupElasticSearch(esVersion): return [{ "name": "setup-es", - "image": "owncloudci/php:7.2", + "image": "owncloudci/php:7.4", "pull": "always", "commands": [ "cd %s" % dir["server"], @@ -2031,7 +2021,7 @@ def installNPM(): def lintTest(): return [{ "name": "lint-test", - "image": "owncloudci/php:7.2", + "image": "owncloudci/php:7.4", "pull": "always", "commands": [ "make test-lint", diff --git a/composer.json b/composer.json index 55986670..4be553b9 100644 --- a/composer.json +++ b/composer.json @@ -2,11 +2,11 @@ "name": "owncloud/notes", "config" : { "platform": { - "php": "7.1" + "php": "7.3" } }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4" diff --git a/composer.lock b/composer.lock index af84e13b..0fc0cd7e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4342d6ca0e5c3955e284495c6070fbfb", + "content-hash": "9a6bbd4ddb9d7132a602b6cf28194d1e", "packages": [], "packages-dev": [ { @@ -64,11 +64,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.1" + "php": ">=7.3" }, "platform-dev": [], "platform-overrides": { - "php": "7.1" + "php": "7.3" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/sonar-project.properties b/sonar-project.properties index 9f5674e3..8bc64c7a 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -29,5 +29,5 @@ sonar.pullrequest.branch=${env.SONAR_PULL_REQUEST_BRANCH} sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY} # Properties specific to language plugins: -sonar.php.coverage.reportPaths=results/clover-phpunit-php7.2-mariadb10.2.xml,results/clover-phpunit-php7.2-mysql8.0.xml,results/clover-phpunit-php7.2-postgres9.4.xml,results/clover-phpunit-php7.2-oracle.xml,results/clover-phpunit-php7.2-sqlite.xml,results/clover-phpintegration-php7.2-mariadb10.2.xml,results/clover-phpintegration-php7.2-mysql8.0.xml,results/clover-phpintegration-php7.2-postgres9.4.xml,results/clover-phpintegration-php7.2-oracle.xml,results/clover-phpintegration-php7.2-sqlite.xml +sonar.php.coverage.reportPaths=results/clover-phpunit-php7.3-mariadb10.2.xml,results/clover-phpunit-php7.3-mysql8.0.xml,results/clover-phpunit-php7.3-postgres9.4.xml,results/clover-phpunit-php7.3-oracle.xml,results/clover-phpunit-php7.3-sqlite.xml,results/clover-phpintegration-php7.3-mariadb10.2.xml,results/clover-phpintegration-php7.3-mysql8.0.xml,results/clover-phpintegration-php7.3-postgres9.4.xml,results/clover-phpintegration-php7.3-oracle.xml,results/clover-phpintegration-php7.3-sqlite.xml sonar.javascript.lcov.reportPaths=results/lcov.info