From eed875ac0cc2ac0f32ee750aa153a7a6db0a174e Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 6 Jun 2023 14:03:53 +0200 Subject: [PATCH] chore: Fix OCP version used for psalm Signed-off-by: Ferdinand Thiessen --- .github/workflows/phpunit-mysql.yml | 2 +- .github/workflows/phpunit-pgsql.yml | 2 +- .github/workflows/phpunit-sqlite.yml | 2 +- .github/workflows/psalm-matrix.yml | 2 +- composer.json | 2 +- composer.lock | 64 +++------------------------- 6 files changed, 12 insertions(+), 62 deletions(-) diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 45f649575..8ce6a1183 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -77,7 +77,7 @@ jobs: uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2 with: php-version: ${{ matrix.php-versions }} - extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql + extensions: mbstring, iconv, fileinfo, gd, intl, mysql, pdo_mysql coverage: none env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index dd51916b3..d18891385 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -74,7 +74,7 @@ jobs: uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2 with: php-version: ${{ matrix.php-versions }} - extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql + extensions: mbstring, iconv, fileinfo, gd, intl, pgsql, pdo_pgsql coverage: none env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 27973de12..22b81f26f 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -63,7 +63,7 @@ jobs: uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2 with: php-version: ${{ matrix.php-versions }} - extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite + extensions: mbstring, iconv, fileinfo, gd, intl, sqlite, pdo_sqlite coverage: none env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml index b3c4119a0..b2a88c8af 100644 --- a/.github/workflows/psalm-matrix.yml +++ b/.github/workflows/psalm-matrix.yml @@ -24,7 +24,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - ocp-version: [ 'dev-master', 'dev-stable25', 'dev-stable24' ] + ocp-version: [ 'dev-stable26', 'dev-stable25', 'dev-stable24' ] name: Nextcloud ${{ matrix.ocp-version }} steps: diff --git a/composer.json b/composer.json index edad95c9f..2f9202d28 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "nextcloud/coding-standard": "^0.4.0", - "nextcloud/ocp": "dev-master", + "nextcloud/ocp": "dev-stable26", "phpunit/phpunit": "^8", "vimeo/psalm": "^4.27" }, diff --git a/composer.lock b/composer.lock index 8c67057bc..e93aafa59 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": "4bef5ce16b30a1f31df7b17b6be8d55d", + "content-hash": "c5ad97558316d455dc40e37854897a40", "packages": [], "packages-dev": [ { @@ -1131,26 +1131,24 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable26", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "4b2842cd374cd47f02da738183857697ef66521d" + "reference": "92d0c03fc41b75647e05d9de743e1b3bda26af35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/4b2842cd374cd47f02da738183857697ef66521d", - "reference": "4b2842cd374cd47f02da738183857697ef66521d", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/92d0c03fc41b75647e05d9de743e1b3bda26af35", + "reference": "92d0c03fc41b75647e05d9de743e1b3bda26af35", "shasum": "" }, "require": { "php": "^7.4 || ~8.0 || ~8.1", - "psr/clock": "^1.0", "psr/container": "^1.1.1", "psr/event-dispatcher": "^1.0", "psr/log": "^1.1" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -1170,9 +1168,9 @@ "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "support": { "issues": "https://github.com/nextcloud-deps/ocp/issues", - "source": "https://github.com/nextcloud-deps/ocp/tree/master" + "source": "https://github.com/nextcloud-deps/ocp/tree/stable26" }, - "time": "2023-02-28T00:39:33+00:00" + "time": "2023-05-18T00:34:12+00:00" }, { "name": "nikic/php-parser", @@ -2058,54 +2056,6 @@ }, "time": "2016-08-06T20:24:11+00:00" }, - { - "name": "psr/clock", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/clock.git", - "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", - "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", - "shasum": "" - }, - "require": { - "php": "^7.0 || ^8.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Clock\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for reading the clock.", - "homepage": "https://github.com/php-fig/clock", - "keywords": [ - "clock", - "now", - "psr", - "psr-20", - "time" - ], - "support": { - "issues": "https://github.com/php-fig/clock/issues", - "source": "https://github.com/php-fig/clock/tree/1.0.0" - }, - "time": "2022-11-25T14:36:26+00:00" - }, { "name": "psr/container", "version": "1.1.2",