diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 7866b8b..e4b8215 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -39,7 +39,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.1']
- server-versions: ['master']
+ server-versions: ['stable31', 'stable32', 'master']
steps:
- name: Set app env
diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
new file mode 100644
index 0000000..b31c9b0
--- /dev/null
+++ b/.github/workflows/psalm-matrix.yml
@@ -0,0 +1,89 @@
+# 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
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
+name: Static analysis
+
+on: pull_request
+
+concurrency:
+ group: psalm-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+permissions:
+ contents: read
+
+jobs:
+ matrix:
+ runs-on: ubuntu-latest-low
+ outputs:
+ ocp-matrix: ${{ steps.versions.outputs.ocp-matrix }}
+ steps:
+ - name: Checkout app
+ uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+ with:
+ persist-credentials: false
+
+ - name: Get version matrix
+ id: versions
+ uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
+
+ - name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
+ run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
+
+ static-analysis:
+ runs-on: ubuntu-latest
+ needs: matrix
+ strategy:
+ # do not stop on another job's failure
+ fail-fast: false
+ matrix: ${{ fromJson(needs.matrix.outputs.ocp-matrix) }}
+
+ name: static-psalm-analysis ${{ matrix.ocp-version }}
+ steps:
+ - name: Checkout
+ uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+ with:
+ persist-credentials: false
+
+ - name: Set up php${{ matrix.php-min }}
+ uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+ with:
+ php-version: ${{ matrix.php-min }}
+ extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
+ coverage: none
+ ini-file: development
+ # Temporary workaround for missing pcntl_* in PHP 8.3
+ ini-values: disable_functions=
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Install dependencies
+ run: |
+ composer remove nextcloud/ocp --dev --no-scripts
+ composer i
+
+ - name: Check for vulnerable PHP dependencies
+ run: composer require --dev roave/security-advisories:dev-latest
+
+ - name: Install dependencies # zizmor: ignore[template-injection]
+ run: composer require --dev 'nextcloud/ocp:${{ matrix.ocp-version }}' --ignore-platform-reqs --with-dependencies
+
+ - name: Run coding standards check
+ run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github
+
+ summary:
+ runs-on: ubuntu-latest-low
+ needs: static-analysis
+
+ if: always()
+
+ name: static-psalm-analysis-summary
+
+ steps:
+ - name: Summary status
+ run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi
\ No newline at end of file
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
deleted file mode 100644
index 60ff661..0000000
--- a/.github/workflows/psalm.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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: Psalm static analysis
-
-on:
- pull_request:
- paths:
- - .github/workflows/psalm.yml
- - appinfo/**
- - composer.*
- - lib/**
- - templates/**
- - tests/**
- push:
- branches:
- - main
- - stable*
- - test
- paths:
- - .github/workflows/psalm.yml
- - appinfo/**
- - composer.*
- - lib/**
- - templates/**
- - tests/**
-
-concurrency:
- group: psalm-${{ github.head_ref || github.run_id }}
- cancel-in-progress: true
-
-jobs:
- static-analysis:
- runs-on: ubuntu-latest
- strategy:
- # do not stop on another job's failure
- fail-fast: false
- matrix:
- ocp-version: [ '^29', '^30', '^31', 'dev-master' ]
- php-version: [ '8.1', '8.2', '8.3' ]
-
-
- name: Psalm check on PHP ${{ matrix.php-version }} and OCP ${{ matrix.ocp-version }}
- steps:
- - name: Checkout
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
- - name: Set up php
- uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2
- with:
- php-version: ${{ matrix.php-version }}
- coverage: none
- ini-file: development
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Install dependencies
- run: composer i
-
- - name: Install dependencies
- run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
-
- - name: Install dependencies
- run: composer require --dev
-
- - name: Run coding standards check
- run: composer run psalm
-
- summary:
- runs-on: ubuntu-latest
- needs: static-analysis
-
- if: always()
-
- name: static-psalm-analysis-summary
-
- steps:
- - name: Summary status
- run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi
diff --git a/appinfo/info.xml b/appinfo/info.xml
index f1b6123..20406aa 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
Integration of GitLab software development management service
- 3.2.0
+ 4.0.0-dev
agpl
Julien Veyssier
Gitlab
@@ -18,7 +18,7 @@
https://github.com/nextcloud/integration_gitlab/issues
https://github.com/nextcloud/integration_gitlab/raw/main/img/screenshot1.jpg
-
+
diff --git a/composer.json b/composer.json
index f8ee100..79d0c04 100644
--- a/composer.json
+++ b/composer.json
@@ -12,14 +12,16 @@
],
"require": {
"league/commonmark": "^2.3",
- "php": "^8.1",
+ "php": "^8.1 || ^8.2 || ^8.3 || ^8.4",
"bamarni/composer-bin-plugin": "^1.8"
},
"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 --no-cache",
+ "psalm": "psalm --no-cache",
+ "psalm:update-baseline": "psalm --threads=1 --update-baseline",
+ "psalm:update-baseline:force": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
"test:unit": "phpunit -c tests/phpunit.xml --no-coverage",
"post-install-cmd": [
"@composer bin all install --ansi",
@@ -34,7 +36,7 @@
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
- "php": "8.1"
+ "php": "8.1.50012"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
diff --git a/composer.lock b/composer.lock
index f9ba246..5f890d2 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": "fd171a397a02c88ad2bd7782ddf7ac0d",
+ "content-hash": "b268ef3f0ae5418182156cb7d868cc59",
"packages": [
{
"name": "bamarni/composer-bin-plugin",
@@ -140,16 +140,16 @@
},
{
"name": "league/commonmark",
- "version": "2.6.2",
+ "version": "2.7.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94"
+ "reference": "10732241927d3971d28e7ea7b5712721fa2296ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/06c3b0bf2540338094575612f4a1778d0d2d5e94",
- "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/10732241927d3971d28e7ea7b5712721fa2296ca",
+ "reference": "10732241927d3971d28e7ea7b5712721fa2296ca",
"shasum": ""
},
"require": {
@@ -178,7 +178,7 @@
"symfony/process": "^5.4 | ^6.0 | ^7.0",
"symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
"unleashedtech/php-coding-standard": "^3.1.1",
- "vimeo/psalm": "^4.24.0 || ^5.0.0"
+ "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0"
},
"suggest": {
"symfony/yaml": "v2.3+ required if using the Front Matter extension"
@@ -186,7 +186,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.7-dev"
+ "dev-main": "2.8-dev"
}
},
"autoload": {
@@ -243,7 +243,7 @@
"type": "tidelift"
}
],
- "time": "2025-04-18T21:09:27+00:00"
+ "time": "2025-07-20T12:47:49+00:00"
},
{
"name": "league/config",
@@ -391,29 +391,29 @@
},
{
"name": "nette/utils",
- "version": "v4.0.6",
+ "version": "v4.0.8",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
- "reference": "ce708655043c7050eb050df361c5e313cf708309"
+ "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
- "reference": "ce708655043c7050eb050df361c5e313cf708309",
+ "url": "https://api.github.com/repos/nette/utils/zipball/c930ca4e3cf4f17dcfb03037703679d2396d2ede",
+ "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede",
"shasum": ""
},
"require": {
- "php": "8.0 - 8.4"
+ "php": "8.0 - 8.5"
},
"conflict": {
"nette/finder": "<3",
"nette/schema": "<1.2.2"
},
"require-dev": {
- "jetbrains/phpstorm-attributes": "dev-master",
+ "jetbrains/phpstorm-attributes": "^1.2",
"nette/tester": "^2.5",
- "phpstan/phpstan": "^1.0",
+ "phpstan/phpstan-nette": "^2.0@stable",
"tracy/tracy": "^2.9"
},
"suggest": {
@@ -431,6 +431,9 @@
}
},
"autoload": {
+ "psr-4": {
+ "Nette\\": "src"
+ },
"classmap": [
"src/"
]
@@ -471,9 +474,9 @@
],
"support": {
"issues": "https://github.com/nette/utils/issues",
- "source": "https://github.com/nette/utils/tree/v4.0.6"
+ "source": "https://github.com/nette/utils/tree/v4.0.8"
},
- "time": "2025-03-30T21:06:30+00:00"
+ "time": "2025-08-06T21:43:34+00:00"
},
{
"name": "psr/event-dispatcher",
@@ -527,16 +530,16 @@
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.5.1",
+ "version": "v3.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
+ "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
- "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+ "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
"shasum": ""
},
"require": {
@@ -549,7 +552,7 @@
"name": "symfony/contracts"
},
"branch-alias": {
- "dev-main": "3.5-dev"
+ "dev-main": "3.6-dev"
}
},
"autoload": {
@@ -574,7 +577,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
},
"funding": [
{
@@ -590,20 +593,20 @@
"type": "tidelift"
}
],
- "time": "2024-09-25T14:20:29+00:00"
+ "time": "2024-09-25T14:21:43+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.31.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
+ "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
- "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+ "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
"shasum": ""
},
"require": {
@@ -654,7 +657,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
},
"funding": [
{
@@ -665,12 +668,16 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2024-09-09T11:45:10+00:00"
+ "time": "2025-01-02T08:10:11+00:00"
}
],
"packages-dev": [
@@ -680,12 +687,12 @@
"source": {
"type": "git",
"url": "https://github.com/nextcloud-deps/ocp.git",
- "reference": "c99b7f918ce947f6f2f5c9e61f68845c70a17680"
+ "reference": "d0a5ca3613e3936612e5ad84e995d3ea42f052a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/c99b7f918ce947f6f2f5c9e61f68845c70a17680",
- "reference": "c99b7f918ce947f6f2f5c9e61f68845c70a17680",
+ "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/d0a5ca3613e3936612e5ad84e995d3ea42f052a5",
+ "reference": "d0a5ca3613e3936612e5ad84e995d3ea42f052a5",
"shasum": ""
},
"require": {
@@ -721,7 +728,7 @@
"issues": "https://github.com/nextcloud-deps/ocp/issues",
"source": "https://github.com/nextcloud-deps/ocp/tree/master"
},
- "time": "2025-04-30T00:50:52+00:00"
+ "time": "2025-09-03T00:45:37+00:00"
},
{
"name": "psr/clock",
@@ -883,13 +890,13 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": "^8.1"
+ "php": "^8.1 || ^8.2 || ^8.3 || ^8.4"
},
"platform-dev": {
"ext-mbstring": "*"
},
"platform-overrides": {
- "php": "8.1"
+ "php": "8.1.50012"
},
"plugin-api-version": "2.6.0"
}
diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php
index 3ecc6fa..f19a9f2 100644
--- a/lib/Controller/ConfigController.php
+++ b/lib/Controller/ConfigController.php
@@ -228,8 +228,8 @@ public function oauthRedirect(string $code = '', string $state = ''): RedirectRe
$account->setUserInfoDisplayName($userInfo['name']);
} catch (Exception $e) {
return new RedirectResponse(
- $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
- '?gitlabToken=error&message=' . urlencode($e->getMessage())
+ $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
+ . '?gitlabToken=error&message=' . urlencode($e->getMessage())
);
}
$this->accountMapper->insert($account);
@@ -239,8 +239,8 @@ public function oauthRedirect(string $code = '', string $state = ''): RedirectRe
$this->config->deleteUserOauthOrigin($this->userId);
if ($oauthOrigin === 'settings') {
return new RedirectResponse(
- $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
- '?gitlabToken=success'
+ $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
+ . '?gitlabToken=success'
);
}
if ($oauthOrigin === 'dashboard') {
@@ -249,8 +249,8 @@ public function oauthRedirect(string $code = '', string $state = ''): RedirectRe
);
}
return new RedirectResponse(
- $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
- '?gitlabToken=success'
+ $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
+ . '?gitlabToken=success'
);
}
$result = $this->l->t('Error getting OAuth access token. ' . $result['error']);
@@ -258,8 +258,8 @@ public function oauthRedirect(string $code = '', string $state = ''): RedirectRe
$result = $this->l->t('Error during OAuth exchanges');
}
return new RedirectResponse(
- $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
- '?gitlabToken=error&message=' . urlencode($result)
+ $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
+ . '?gitlabToken=error&message=' . urlencode($result)
);
}
diff --git a/lib/Reference/GitlabReferenceProvider.php b/lib/Reference/GitlabReferenceProvider.php
index d68b652..eb6e3bc 100644
--- a/lib/Reference/GitlabReferenceProvider.php
+++ b/lib/Reference/GitlabReferenceProvider.php
@@ -203,7 +203,7 @@ public function resolveReference(string $referenceText): ?IReference {
return $reference;
}
} catch (Exception $e) {
- $this->logger->error('Failed to resolve reference for url ' . $baseUrl . ' with account id ' . $account?->getId(), ['exception' => $e]);
+ $this->logger->error('Failed to resolve reference for url ' . $baseUrl . ' with account id ' . ((string)$account?->getId()), ['exception' => $e]);
}
}
diff --git a/lib/Service/GitlabAPIService.php b/lib/Service/GitlabAPIService.php
index 8760bab..d72287f 100644
--- a/lib/Service/GitlabAPIService.php
+++ b/lib/Service/GitlabAPIService.php
@@ -74,7 +74,7 @@ public static function getGitLabPaginationValues(int $offset = 0, int $limit = 5
if (($offset % $limit) === 0) {
$perPage = $limit;
// page number starts at 1
- $page = ($offset / $limit) + 1;
+ $page = ((int)($offset / $limit)) + 1;
return [$perPage, $page, 0];
} else {
$firstIndex = $offset;
diff --git a/psalm.xml b/psalm.xml
index 40360d7..a9084a5 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -5,7 +5,7 @@
findUnusedBaselineEntry="true"
findUnusedCode="false"
resolveFromConfigFile="true"
- phpVersion="8.0"
+ phpVersion="8.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd">
@@ -38,11 +38,5 @@
-
-
-
-
-
-
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0a00170..b3830a1 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,22 @@
loadApp(OCA\Gitlab\AppInfo\Application::APP_ID);
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 03555f7..0fe8b4b 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,3 +1,117 @@
-
-
\ No newline at end of file
+
+
+
+