Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Jan 22, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #30508

@skjnldsv
Copy link
Member

@CarlSchwan can you have a look? :)

@CarlSchwan
Copy link
Member

This needs a composer psalm -- --set-baseline=build/psalm-baseline.xml to make the baseline up to date

I will try to do it tonight unless someone beat me to it before ;)

@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch 2 times, most recently from e6001f7 to c60321f Compare January 22, 2022 19:48
@CarlSchwan
Copy link
Member

I hope the tests will pass now :)

@skjnldsv
Copy link
Member

Same for stable22 :)
#30508 (comment)

@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch from c60321f to ae9c810 Compare January 24, 2022 09:50
@CarlSchwan
Copy link
Member

@skjnldsv This PR should be good now :) The issue with 'Code scanning results / Psalm' is that it is comparing with stable23 and as we updated the psalm dependency the comparison fails. This will fix itself automatically once merged, as new PR will compare against the new baseline.

@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch from ae9c810 to 01cb494 Compare January 24, 2022 10:32
@CarlSchwan
Copy link
Member

/me forgot to run cs:fixer 😭

@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch 2 times, most recently from a9abdb7 to 283b4cf Compare January 24, 2022 11:52
@MichaIng MichaIng added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 25, 2022
@skjnldsv skjnldsv mentioned this pull request Jan 25, 2022
3 tasks
@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch 2 times, most recently from 6a6f469 to f43fcd2 Compare January 26, 2022 11:18
@skjnldsv
Copy link
Member

Please edit the checker :)

ERROR: There were 2 additional files:
223 | .php-cs-fixer.dist.php
224 | vendor-bin
225 | ERROR: There were 1 missing files:
226 | .php_cs.dist

The issue was that we were using psalm/phar instead of vimeo/psalm. This
caused issue with the custom psalm plugin in buildd/psalm.

This is using the opportunity to also update the psalm version from 3.8
to 3.17 and the php-cs-fixer too.

Signed-off-by: Carl Schwan <[email protected]>
@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch from f43fcd2 to d69531a Compare January 27, 2022 16:20
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 27, 2022
@skjnldsv skjnldsv merged commit 3ee9bcc into stable23 Jan 27, 2022
@skjnldsv skjnldsv deleted the backport/30508/stable23 branch January 27, 2022 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants