diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index e811d49..87d16a0 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -12,7 +12,10 @@ jobs: strategy: matrix: php-versions: ['8.0', '8.1', '8.2'] - nextcloud-versions: ['stable26', 'stable27', 'stable28'] + nextcloud-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'stable30'] + exclude: + - php-versions: '8.0' + nextcloud-versions: 'stable30' name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 33dcb49..84b6534 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -6,7 +6,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocp-version: [ '^28', '^27', '^26'] + ocp-version: [ "^30", "^29", '^28', '^27', '^26'] + include: + - psrcontainer: "psr/container" + - psrcontainer: "psr/container:^1.1.2" + ocp-version: '^26' name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout @@ -21,7 +25,7 @@ jobs: - name: Install dependencies run: composer i - name: Install dependencies - run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} symfony/service-contracts + run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} ${{ matrix.psrcontainer }} symfony/service-contracts - name: Run coding standards check run: composer run psalm diff --git a/appinfo/info.xml b/appinfo/info.xml index d075ef0..3e5e6e2 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -22,7 +22,7 @@ Contributors are welcome! If you have time it would be awesome if you could help *This app integrates BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.* ]]> - 2.7.2 + 2.7.3 agpl Arawa Klaus Herberth @@ -44,7 +44,7 @@ Contributors are welcome! If you have time it would be awesome if you could help curl mbstring SimpleXML - + OCA\BigBlueButton\Command\ClearAvatarCache diff --git a/composer.json b/composer.json index fd0ca52..5a04a63 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "phpstan/phpstan": "^0.12.29", "nextcloud/ocp": "^25.0 || ^26.0 || ^27.0", "vimeo/psalm": "^5.0", - "psr/container": "^1.1.2" + "psr/container": "^1.1.2 || ^2.0.2" }, "config": { "optimize-autoloader": true, diff --git a/lib/NoPermissionResponse.php b/lib/NoPermissionResponse.php index d238b2a..b334923 100644 --- a/lib/NoPermissionResponse.php +++ b/lib/NoPermissionResponse.php @@ -6,6 +6,12 @@ use OCP\AppFramework\Http\Response; use OCP\Template; +/** + * @template-extends Response> + * + * (NC < 28) + * @psalm-suppress TooManyTemplateParams + */ class NoPermissionResponse extends Response { public function __construct() { parent::__construct(); diff --git a/lib/NotFoundResponse.php b/lib/NotFoundResponse.php index 815932c..9630175 100644 --- a/lib/NotFoundResponse.php +++ b/lib/NotFoundResponse.php @@ -6,6 +6,12 @@ use OCP\AppFramework\Http\Response; use OCP\Template; +/** + * @template-extends Response> + * + * (NC < 28) + * @psalm-suppress TooManyTemplateParams + */ class NotFoundResponse extends Response { public function __construct() { parent::__construct();