From 59980dfda96c621a23ae56388e6b463eb4dafbc1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 2 Oct 2022 09:44:54 +0200 Subject: [PATCH] Migrate to nextcloud/OCP package in stable25 Signed-off-by: Joas Schilling --- .github/workflows/psalm.yml | 19 ++-- ...nextcloud.yml => update-nextcloud-ocp.yml} | 18 ++-- composer.json | 34 +++---- composer.lock | 90 +++++++++---------- 4 files changed, 79 insertions(+), 82 deletions(-) rename .github/workflows/{update-christophwurst-nextcloud.yml => update-nextcloud-ocp.yml} (70%) diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 8bee95cf..27091d53 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -1,24 +1,26 @@ +# 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: pull_request: push: branches: + - master - main - stable* jobs: - static-psalm-analysis: + static-analysis: runs-on: ubuntu-latest - strategy: - matrix: - ocp-version: [ 'dev-stable25' ] - - 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 @@ -29,8 +31,5 @@ jobs: - name: Install dependencies run: composer i - - name: Install dependencies - run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} - - 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 c8ad9a57..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 * * 1-5" + - 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 3d1a0f88..7e75e8f7 100644 --- a/composer.json +++ b/composer.json @@ -1,31 +1,31 @@ { "autoload-dev": { "psr-4": { - "OCP\\": "vendor/christophwurst/nextcloud/OCP", + "OCP\\": "vendor/nextcloud/ocp/OCP", "OCA\\UserMigration\\": "lib/" } }, "scripts": { "cs:fix": "php-cs-fixer fix", - "cs:check": "php-cs-fixer fix --dry-run --diff", - "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -not -path './node_modules/*' -print0 | xargs -0 -n1 php -l", + "cs:check": "php-cs-fixer fix --dry-run --diff", + "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -not -path './node_modules/*' -print0 | xargs -0 -n1 php -l", "psalm": "psalm", "psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType", "psalm:update-baseline": "psalm --threads=1 --update-baseline" - }, - "config": { - "optimize-autoloader": true, - "classmap-authoritative": true, - "platform": { - "php": "7.4" - } - }, - "require-dev": { - "nextcloud/coding-standard": "^1.0.0", - "phpunit/phpunit": "^9.5", - "christophwurst/nextcloud": "dev-stable25", + }, + "config": { + "optimize-autoloader": true, + "classmap-authoritative": true, + "platform": { + "php": "7.4" + } + }, + "require-dev": { + "nextcloud/coding-standard": "^1.0.0", + "phpunit/phpunit": "^9.5", "vimeo/psalm": "^4.19", "doctrine/dbal": "^3", - "deepdiver/zipstreamer": "^2.0" - } + "deepdiver/zipstreamer": "^2.0", + "nextcloud/ocp": "dev-stable25" + } } diff --git a/composer.lock b/composer.lock index da454865..8fea87e6 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": "fc300037c17a3b90bea9ed532f84ee6a", + "content-hash": "352c1b899f9119c89e5f590be1ea298f", "packages": [], "packages-dev": [ { @@ -173,50 +173,6 @@ ], "time": "2021-03-30T17:13:30+00:00" }, - { - "name": "christophwurst/nextcloud", - "version": "dev-stable25", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "2eba68e1533a07d256d0162bbf27c46d79442388" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/2eba68e1533a07d256d0162bbf27c46d79442388", - "reference": "2eba68e1533a07d256d0162bbf27c46d79442388", - "shasum": "" - }, - "require": { - "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.1.1", - "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" - }, - "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": { - "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", - "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/stable25" - }, - "abandoned": "nextcloud/ocp", - "time": "2022-09-27T02:33:17+00:00" - }, { "name": "composer/package-versions-deprecated", "version": "1.11.99.5", @@ -1511,6 +1467,48 @@ }, "time": "2021-11-10T08:44:10+00:00" }, + { + "name": "nextcloud/ocp", + "version": "dev-stable25", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "20476bc52a77f41fbebdb95ecdc6dbe290263305" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/20476bc52a77f41fbebdb95ecdc6dbe290263305", + "reference": "20476bc52a77f41fbebdb95ecdc6dbe290263305", + "shasum": "" + }, + "require": { + "php": "^7.4 || ~8.0 || ~8.1", + "psr/container": "^1.1.1", + "psr/event-dispatcher": "^1.0", + "psr/log": "^1.1" + }, + "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/stable25" + }, + "time": "2022-10-01T01:06:18+00:00" + }, { "name": "nikic/php-parser", "version": "v4.14.0", @@ -5180,7 +5178,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false,