From ada8b732d97876018806c87db28f7a5e784a29bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?= Date: Wed, 18 Mar 2026 14:41:33 +0100 Subject: [PATCH] feat: php8 support --- .drone.star | 17 +++----- .github/workflows/main.yml | 47 +++++++++++++++++++++ appinfo/info.xml | 4 +- composer.json | 2 +- composer.lock | 32 +++++++------- vendor-bin/owncloud-codestyle/composer.json | 2 +- 6 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/main.yml diff --git a/.drone.star b/.drone.star index d91e57f..f43f134 100644 --- a/.drone.star +++ b/.drone.star @@ -4,7 +4,7 @@ MINIO_MC = "minio/mc:RELEASE.2020-12-18T10-53-53Z" OC_CI_ALPINE = "owncloudci/alpine:latest" OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier" OC_CI_CEPH = "owncloudci/ceph:tag-build-master-jewel-ubuntu-16.04" -OC_CI_CORE = "owncloudci/core" +OC_CI_CORE = "owncloudci/core:php83" OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline" OC_CI_NODEJS = "owncloudci/nodejs:%s" OC_CI_ORACLE_XE = "owncloudci/oracle-xe:latest" @@ -25,7 +25,7 @@ SONARSOURCE_SONAR_SCANNER_CLI = "sonarsource/sonar-scanner-cli" FAURIA_VSFTPD = "fauria/vsftpd" DRIESVA_PROFTPD = "driesva/proftpd:1.3.8" -DEFAULT_PHP_VERSION = "7.4" +DEFAULT_PHP_VERSION = "8.3" DEFAULT_NODEJS_VERSION = "14" # minio mc environment variables @@ -57,16 +57,9 @@ config = { "branches": [ "master", ], - "codestyle": True, - "phpstan": True, - "phan": { - "multipleVersions": { - "phpVersions": [ - DEFAULT_PHP_VERSION, - "7.3", - ], - }, - }, + "codestyle": False, + "phpstan": False, + "phan": False, "phpunit": { "proftp": { "phpVersions": [ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..e6574a3 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,47 @@ +name: CI + +on: + push: + branches: + - master + pull_request: + types: + - opened + - synchronize + - reopened + +permissions: + contents: read + +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + +env: + APP_NAME: files_external_ftp + PHP_VERSIONS: '["8.3"]' + +jobs: + get-vars: + runs-on: ubuntu-latest + outputs: + app-name: ${{ env.APP_NAME }} + php-versions: ${{ env.PHP_VERSIONS }} + steps: + - name: Set variables + run: | + echo "App name $APP_NAME" + echo "PHP versions string: $PHP_VERSIONS" + + semantic-git-messages: + name: Commits + uses: owncloud/reusable-workflows/.github/workflows/semantic-git-message.yml@main + + php-code-style: + name: PHP Code Style + needs: + - get-vars + uses: owncloud/reusable-workflows/.github/workflows/php-codestyle.yml@main + with: + app-name: ${{ needs.get-vars.outputs.app-name }} + php-versions: ${{ needs.get-vars.outputs.php-versions }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 95d8085..adda072 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -16,7 +16,7 @@ Administrators and users (when enabled) can find external storage configuration AGPL Robin Appelman, Thomas Müller, Vincent Petry, Ilja Neumann - 0.2.1 + 0.3.0 storage @@ -28,7 +28,7 @@ Administrators and users (when enabled) can find external storage configuration https://raw.githubusercontent.com/owncloud/promo/e1dd604d66b4c5f765579b4c160de3268169ea3c/ownCloud%20logo%20square.png - + https://github.com/owncloud/files_external_ftp/ https://github.com/owncloud/files_external_ftp/issues diff --git a/composer.json b/composer.json index 9beff0b..aefe6a0 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "owncloud/files_external_ftp", "config" : { "platform": { - "php": "7.3" + "php": "8.3" }, "allow-plugins": { "bamarni/composer-bin-plugin": true diff --git a/composer.lock b/composer.lock index 00095ba..5e928bd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "752b1957e6fba38da5eed814dafd9324", + "content-hash": "7d286b5b32c4718b8d5519eec3e8e5d0", "packages": [], "packages-dev": [ { "name": "bamarni/composer-bin-plugin", - "version": "1.8.2", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/bamarni/composer-bin-plugin.git", - "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880" + "reference": "641d0663f5ac270b1aeec4337b7856f76204df47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", - "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", + "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/641d0663f5ac270b1aeec4337b7856f76204df47", + "reference": "641d0663f5ac270b1aeec4337b7856f76204df47", "shasum": "" }, "require": { @@ -26,12 +26,12 @@ "php": "^7.2.5 || ^8.0" }, "require-dev": { - "composer/composer": "^2.0", + "composer/composer": "^2.2.26", "ext-json": "*", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^8.5 || ^9.5", + "phpstan/phpstan": "^1.8 || ^2.0", + "phpstan/phpstan-phpunit": "^1.1 || ^2.0", + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.0", "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0" @@ -60,20 +60,20 @@ ], "support": { "issues": "https://github.com/bamarni/composer-bin-plugin/issues", - "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.2" + "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.9.1" }, - "time": "2022-10-31T08:38:03+00:00" + "time": "2026-02-04T10:18:12+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { - "php": "7.3" + "php": "8.3" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/vendor-bin/owncloud-codestyle/composer.json b/vendor-bin/owncloud-codestyle/composer.json index d16041f..e54768d 100644 --- a/vendor-bin/owncloud-codestyle/composer.json +++ b/vendor-bin/owncloud-codestyle/composer.json @@ -1,5 +1,5 @@ { "require": { - "owncloud/coding-standard": "^4.1" + "owncloud/coding-standard": "^5.3" } }