Skip to content

chore: set minimium NC version to 30 #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcelklehr merged 1 commit into from
Jul 10, 2025
Merged

chore: set minimium NC version to 30 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/integration_slack/main/img/screenshot1.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/integration_slack/main/img/screenshot2.png</screenshot>
<dependencies>
<nextcloud min-version="28" max-version="32"/>
<nextcloud min-version="30" max-version="32"/>
</dependencies>
<settings>
<admin>OCA\Slack\Settings\Admin</admin>
Expand Down
6 changes: 2 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
],
"require": {
"php": "^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4",
"bamarni/composer-bin-plugin": "^1.8"
},
"scripts": {
Expand All @@ -20,17 +20,15 @@
"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",
"composer dump-autoload"
],
"post-update-cmd": [
"@composer bin all update --ansi",
"composer dump-autoload"
]
Copy link
Member

@marcelklehr marcelklehr Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these should probably stay, no?

Copy link
Author

@kyteinsky kyteinsky Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking "forward-command": true does this for us now, but looking at it again, maybe we still need the composer dump-autoload

Copy link
Member

@marcelklehr marcelklehr Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea. I just know this was required when I added bamarni-bin

Copy link
Member

@marcelklehr marcelklehr Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, classmap-authoritative should be false, because this can cause updates to fail

Copy link
Author

@kyteinsky kyteinsky Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, classmap-authoritative seems to disable classes generated at runtime. This may fail if we do that at a future point in time. (https://getcomposer.org/doc/articles/autoloader-optimization.md#optimization-level-2-a-authoritative-class-maps)
Added the dump-autoload back too. We don't need the fast load times for bamarni-bins since they're all tests but it's a good default.

},
"config": {
"optimize-autoloader": true,
"classmap-authoritative": true,
"classmap-authoritative": false,
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
Expand Down
4 changes: 2 additions & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
findUnusedCode="false"
resolveFromConfigFile="true"
ensureOverrideAttribute="false"
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">
Expand Down Expand Up @@ -33,10 +33,5 @@
<referencedClass name="GuzzleHttp\Exception\ServerException" />
</errorLevel>
</UndefinedClass>
<DuplicateArrayKey>
<errorLevel type="suppress">
<file name="lib/Service/SlackAPIService.php" />
</errorLevel>
</DuplicateArrayKey>
</issueHandlers>
</psalm>
2 changes: 1 addition & 1 deletion vendor-bin/php-cs-fixer/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"php": "^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4"
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4"
},
"require-dev": {
"nextcloud/coding-standard": "^1.1"
Expand Down
16 changes: 8 additions & 8 deletions vendor-bin/php-cs-fixer/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor-bin/phpunit/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"php": "^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4"
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4"
},
"require-dev": {
"phpunit/phpunit": "^10.5.45"
Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/phpunit/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor-bin/psalm/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"php": "^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4"
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4"
},
"require-dev": {
"vimeo/psalm": "^6.10.0"
Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/psalm/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading