From 1b871eb0794067011f0dabc41cadd8a9611a2535 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 26 Sep 2022 19:49:41 +0200 Subject: [PATCH] Migrate to nextcloud/OCP package in stable24 Signed-off-by: Joas Schilling --- .github/workflows/psalm.yml | 30 +++++++++ .github/workflows/static-analysis.yml | 26 -------- composer.json | 4 +- composer.lock | 90 +++++++++++++-------------- 4 files changed, 76 insertions(+), 74 deletions(-) create mode 100644 .github/workflows/psalm.yml delete mode 100644 .github/workflows/static-analysis.yml diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml new file mode 100644 index 000000000..ff271c1e7 --- /dev/null +++ b/.github/workflows/psalm.yml @@ -0,0 +1,30 @@ +name: Static analysis + +on: + pull_request: + push: + branches: + - master + - main + - stable* + +jobs: + static-analysis: + runs-on: ubuntu-latest + + name: Nextcloud ${{ matrix.ocp-version }} + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up php + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 + coverage: none + + - name: Install dependencies + run: composer i + + - name: Run coding standards check + run: composer run psalm diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml deleted file mode 100644 index 745ab2c02..000000000 --- a/.github/workflows/static-analysis.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Static analysis - -on: [pull_request] - -jobs: - static-psalm-analysis: - runs-on: ubuntu-latest - strategy: - matrix: - ocp-version: [ 'dev-stable24' ] - name: Nextcloud ${{ matrix.ocp-version }} - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up php - uses: shivammathur/setup-php@v2 - with: - php-version: 7.4 - tools: composer:v1 - coverage: none - - 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/composer.json b/composer.json index ff24c74a1..a65f60700 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "phpunit/phpunit": "^9.5", "nextcloud/coding-standard": "^1.0.0", "psalm/phar": "^4.3", - "christophwurst/nextcloud": "dev-stable24" + "nextcloud/ocp": "dev-stable24" }, "config": { "optimize-autoloader": true, @@ -17,7 +17,7 @@ }, "autoload-dev": { "psr-4": { - "OCP\\": "vendor/christophwurst/nextcloud/OCP", + "OCP\\": "vendor/nextcloud/ocp/OCP", "OCA\\Activity\\": "lib/" } }, diff --git a/composer.lock b/composer.lock index 7c456e18a..01984172f 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": "2cfa6e8dcf60de41e4bf3dfb4393b379", + "content-hash": "dfa04a7f7bdc7521b7b87733bd285389", "packages": [], "packages-dev": [ - { - "name": "christophwurst/nextcloud", - "version": "dev-stable24", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "55af8ca3c8530d23aa1aecf4e149bea04fa47207" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/55af8ca3c8530d23aa1aecf4e149bea04fa47207", - "reference": "55af8ca3c8530d23aa1aecf4e149bea04fa47207", - "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": "24.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/stable24" - }, - "abandoned": "nextcloud/ocp", - "time": "2022-08-23T02:31:47+00:00" - }, { "name": "composer/pcre", "version": "1.0.1", @@ -676,6 +632,48 @@ }, "time": "2021-11-10T08:44:10+00:00" }, + { + "name": "nextcloud/ocp", + "version": "dev-stable24", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "55af8ca3c8530d23aa1aecf4e149bea04fa47207" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/55af8ca3c8530d23aa1aecf4e149bea04fa47207", + "reference": "55af8ca3c8530d23aa1aecf4e149bea04fa47207", + "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": "24.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/stable24" + }, + "time": "2022-08-23T02:31:47+00:00" + }, { "name": "nikic/php-parser", "version": "v4.13.2", @@ -4241,7 +4239,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false,