From 4fa99a42b153661b2122fb045758e3553f5621eb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 2 Oct 2022 09:22:02 +0200 Subject: [PATCH] Migrate to nextcloud/OCP package in master Signed-off-by: Joas Schilling --- .../{static-analysis.yml => psalm.yml} | 18 ++-- ...nextcloud.yml => update-nextcloud-ocp.yml} | 18 ++-- composer.json | 69 +++++++------- composer.lock | 91 +++++++++---------- 4 files changed, 101 insertions(+), 95 deletions(-) rename .github/workflows/{static-analysis.yml => psalm.yml} (56%) rename .github/workflows/{update-christophwurst-nextcloud.yml => update-nextcloud-ocp.yml} (70%) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/psalm.yml similarity index 56% rename from .github/workflows/static-analysis.yml rename to .github/workflows/psalm.yml index 3536fde5..27091d53 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/psalm.yml @@ -1,3 +1,8 @@ +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization + name: Static analysis on: @@ -5,20 +10,17 @@ on: push: branches: - master + - main - stable* jobs: - static-psalm-analysis: + static-analysis: runs-on: ubuntu-latest - strategy: - matrix: - ocp-version: [ 'dev-master' ] - - name: Nextcloud ${{ matrix.ocp-version }} + name: Nextcloud steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v3 - name: Set up php uses: shivammathur/setup-php@v2 @@ -27,7 +29,7 @@ jobs: coverage: none - name: Install dependencies - run: composer install --dev + run: composer i - name: Run coding standards check run: composer run psalm diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-nextcloud-ocp.yml similarity index 70% rename from .github/workflows/update-christophwurst-nextcloud.yml rename to .github/workflows/update-nextcloud-ocp.yml index 50c81c6f..cabfc6fe 100644 --- a/.github/workflows/update-christophwurst-nextcloud.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -3,15 +3,15 @@ # https://github.com/nextcloud/.github # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -name: Update christophwurst/nextcloud +name: Update nextcloud/ocp on: workflow_dispatch: schedule: - - cron: "5 4 * * 0" + - cron: "5 2 * * 0" jobs: - update-christophwurst-nextcloud: + update-nextcloud-ocp: runs-on: ubuntu-latest strategy: @@ -19,7 +19,7 @@ jobs: matrix: branches: ["master", "stable25", "stable24", "stable23"] - name: update-christophwurst-nextcloud-${{ matrix.branches }} + name: update-nextcloud-ocp-${{ matrix.branches }} steps: - uses: actions/checkout@v3 @@ -37,8 +37,8 @@ jobs: - name: Composer install run: composer install - - name: Composer update christophwurst/nextcloud - run: composer require --dev christophwurst/nextcloud:dev-${{ matrix.branches }} + - name: Composer update nextcloud/ocp + run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }} continue-on-error: true - name: Reset checkout dirs @@ -56,10 +56,10 @@ jobs: committer: GitHub author: nextcloud-command signoff: true - branch: automated/noid/${{ matrix.branches }}-update-christophwurst-nextcloud - title: "[${{ matrix.branches }}] Update christophwurst/nextcloud dependency" + branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp + title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency" body: | - Auto-generated update of [christophwurst/nextcloud](https://github.com/ChristophWurst/nextcloud_composer/) dependency + Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency labels: | dependencies 3. to review diff --git a/composer.json b/composer.json index e9075cfd..dad854d0 100644 --- a/composer.json +++ b/composer.json @@ -1,36 +1,41 @@ { - "name": "nextcloud/end_to_end_encryption", - "description": "-", - "type": "project", - "license": "AGPL", - "authors": [ - { - "name": "Georg Ehrke" - } - ], - "require-dev": { - "phpunit/phpunit": "^9.5", - "christophwurst/nextcloud": "dev-master@dev", + "name": "nextcloud/end_to_end_encryption", + "description": "-", + "type": "project", + "license": "AGPL", + "authors": [ + { + "name": "Georg Ehrke" + } + ], + "require-dev": { + "phpunit/phpunit": "^9.5", "psalm/phar": "^4.22", - "nextcloud/coding-standard": "^1.0" - }, - "scripts": { - "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l", - "cs:check": "php-cs-fixer fix --dry-run --diff", - "cs:fix": "php-cs-fixer fix", - "psalm": "psalm.phar --threads=1", + "nextcloud/coding-standard": "^1.0", + "nextcloud/ocp": "dev-master" + }, + "scripts": { + "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l", + "cs:check": "php-cs-fixer fix --dry-run --diff", + "cs:fix": "php-cs-fixer fix", + "psalm": "psalm.phar --threads=1", "psalm:update-baseline": "psalm.phar --threads=1 --update-baseline", - "psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache", - "psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType", - "test": "phpunit --configuration phpunit.xml --fail-on-warning", - "test:integration": "phpunit --configuration phpunit.integration.xml --fail-on-warning" - }, - "config": { - "allow-plugins": { - "composer/package-versions-deprecated": true - }, - "platform": { - "php": "7.4" - } - } + "psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache", + "psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType", + "test": "phpunit --configuration phpunit.xml --fail-on-warning", + "test:integration": "phpunit --configuration phpunit.integration.xml --fail-on-warning" + }, + "config": { + "allow-plugins": { + "composer/package-versions-deprecated": true + }, + "platform": { + "php": "7.4" + } + }, + "autoload-dev": { + "psr-4": { + "OCP\\": "vendor/nextcloud/ocp/OCP" + } + } } diff --git a/composer.lock b/composer.lock index 6c562479..ed2bfb85 100644 --- a/composer.lock +++ b/composer.lock @@ -4,53 +4,9 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e2fbd48dc7f89198b5d7a6f2447a4064", + "content-hash": "8b736822b637faf3fbcbe712d53d8d9c", "packages": [], "packages-dev": [ - { - "name": "christophwurst/nextcloud", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "9f9f727cf66a75ece93cee24c01074a477e1615e" - }, - "dist": { - "type": "zip", - "url": "https://github.com/gitapi/repos/ChristophWurst/nextcloud_composer/zipball/9f9f727cf66a75ece93cee24c01074a477e1615e", - "reference": "9f9f727cf66a75ece93cee24c01074a477e1615e", - "shasum": "" - }, - "require": { - "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.1.1", - "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" - }, - "default-branch": true, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "25.0.0-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "AGPL-3.0-or-later" - ], - "authors": [ - { - "name": "Christoph Wurst", - "email": "christoph@winzerhof-wurst.at" - } - ], - "description": "Composer package containing Nextcloud's public API (classes, interfaces)", - "support": { - "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", - "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master" - }, - "time": "2022-08-18T02:33:31+00:00" - }, { "name": "composer/pcre", "version": "3.0.0", @@ -676,6 +632,49 @@ }, "time": "2021-11-10T08:44:10+00:00" }, + { + "name": "nextcloud/ocp", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "04ad54073af7a8c57ff147d33c3252832bba10f9" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gitapi/repos/nextcloud-deps/ocp/zipball/04ad54073af7a8c57ff147d33c3252832bba10f9", + "reference": "04ad54073af7a8c57ff147d33c3252832bba10f9", + "shasum": "" + }, + "require": { + "php": "^7.4 || ~8.0 || ~8.1", + "psr/container": "^1.1.1", + "psr/event-dispatcher": "^1.0", + "psr/log": "^1.1" + }, + "default-branch": true, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "26.0.0-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Christoph Wurst", + "email": "christoph@winzerhof-wurst.at" + } + ], + "description": "Composer package containing Nextcloud's public API (classes, interfaces)", + "support": { + "source": "https://github.com/nextcloud-deps/ocp/tree/master" + }, + "time": "2022-10-02T00:58:49+00:00" + }, { "name": "nikic/php-parser", "version": "v4.13.2", @@ -4241,7 +4240,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false,