Skip to content

Commit

Permalink
Merge pull request #307 from arawa/release/2.7.3
Browse files Browse the repository at this point in the history
Release/2.7.3
  • Loading branch information
zak39 authored Nov 28, 2024
2 parents b60d1e7 + c5f8eab commit c2e6130
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/php-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
]]></description>
<version>2.7.2</version>
<version>2.7.3</version>
<licence>agpl</licence>
<author mail="[email protected]" homepage="https://arawa.fr/">Arawa</author>
<author>Klaus Herberth</author>
Expand All @@ -44,7 +44,7 @@ Contributors are welcome! If you have time it would be awesome if you could help
<lib>curl</lib>
<lib>mbstring</lib>
<lib>SimpleXML</lib>
<nextcloud min-version="26" max-version="28"/>
<nextcloud min-version="26" max-version="30"/>
</dependencies>
<commands>
<command>OCA\BigBlueButton\Command\ClearAvatarCache</command>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions lib/NoPermissionResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
use OCP\AppFramework\Http\Response;
use OCP\Template;

/**
* @template-extends Response<int, array<string, mixed>>
*
* (NC < 28)
* @psalm-suppress TooManyTemplateParams
*/
class NoPermissionResponse extends Response {
public function __construct() {
parent::__construct();
Expand Down
6 changes: 6 additions & 0 deletions lib/NotFoundResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
use OCP\AppFramework\Http\Response;
use OCP\Template;

/**
* @template-extends Response<int, array<string, mixed>>
*
* (NC < 28)
* @psalm-suppress TooManyTemplateParams
*/
class NotFoundResponse extends Response {
public function __construct() {
parent::__construct();
Expand Down

0 comments on commit c2e6130

Please sign in to comment.