Skip to content
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

Jump to bottom

chore: Update PSR container to 2.0.2 #36617

Merged
merged 2 commits into from
Apr 18, 2023
Merged

chore: Update PSR container to 2.0.2 #36617

merged 2 commits into from
Apr 18, 2023

Conversation

susnux
Copy link
Contributor

@susnux susnux commented Feb 8, 2023 •
edited by nickvergessen
Loading

Checklist

@susnux susnux requested a review from ChristophWurst February 8, 2023 16:16
@susnux susnux mentioned this pull request Feb 8, 2023
Merged
@susnux susnux force-pushed the update/psr-container branch from 8186263 to 3833a31 Compare February 8, 2023 17:22
@ChristophWurst ChristophWurst added 2. developing Work in progress 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 8, 2023
ChristophWurst
ChristophWurst approved these changes Feb 8, 2023
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment •
edited
Loading

Choose a reason for hiding this comment

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

We'll need to wait for the 26 branch-off, though

https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule/de2553401ea6869015cf1f6f12f3758b4be7ca89#nextcloud-26

@nickvergessen nickvergessen added this to the Nextcloud 27 milestone Feb 8, 2023
@susnux susnux force-pushed the update/psr-container branch 3 times, most recently from 4ee0de4 to b0091ad Compare February 8, 2023 21:21
@ChristophWurst
Copy link
Member

https://github.com/nextcloud-deps/ocp/blob/5c5b6d8600ddaf9f466736e34103b2921cc9b0e3/composer.json#L15 needs an update too to keep app static analysis in sync with what's hipped in server

@ChristophWurst ChristophWurst added the pending documentation This pull request needs an associated documentation update label Feb 15, 2023
@ChristophWurst
Copy link
Member

Like with https://docs.nextcloud.com/server/latest/developer_manual/digging_deeper/psr.html#psr-3-logger-interface we should probably mention the upgrade in the dev docs

@susnux susnux force-pushed the update/psr-container branch from b0091ad to 406a9ab Compare March 16, 2023 12:43
This was referenced Mar 16, 2023
Merged
Merged
@susnux
Copy link
Contributor Author

susnux commented Mar 16, 2023

We should probably mention the upgrade in the dev docs

Pending documentation: nextcloud/documentation#9906

Needs an update too to keep app static analysis in sync with what's hipped in server

Pending PR: nextcloud-deps/ocp#6

@susnux susnux requested review from nickvergessen and come-nc March 16, 2023 12:54
@come-nc
Copy link
Contributor

come-nc commented Mar 17, 2023

But the question from Joas is still pending, this would mean master will require PHP 8.0.2 which is more restricting than current 8.0

@szaimen
Copy link
Contributor

szaimen commented Apr 17, 2023

@susnux can you please fix the conflicts so that we can merge this? Thanks in advance! :)

@szaimen szaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Apr 17, 2023
susnux added 2 commits April 17, 2023 18:35
@susnux
chore: Update PSR container to 2.0.2, matching 3rdparty nextcloud/3…
698332e 
…rdparty#1311

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
@susnux
fix: Adjust console formatter code to match with Symfony type hints
dc9d8c4 
Symfony has added type hints on the `OutputFormatterInterface`,
so we must adjust our type hints to match with Symfony.

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
@susnux susnux force-pushed the update/psr-container branch from 406a9ab to dc9d8c4 Compare April 17, 2023 16:35
@susnux
Copy link
Contributor Author

susnux commented Apr 17, 2023

@szaimen done

@szaimen
Copy link
Contributor

szaimen commented Apr 18, 2023

CI failure unrelated

@szaimen szaimen merged commit 8fe22eb into master Apr 18, 2023
@szaimen szaimen deleted the update/psr-container branch April 18, 2023 09:40
@susnux
Copy link
Contributor Author

susnux commented Apr 18, 2023

Should not the 3rdparty PR get merged first so that the submodule can be updated?

@szaimen
Copy link
Contributor

szaimen commented Apr 18, 2023

Fuck you are right!

@szaimen
Copy link
Contributor

szaimen commented Apr 18, 2023

Can you create a follow-up PR for server?

@szaimen szaimen restored the update/psr-container branch April 18, 2023 10:32
@szaimen szaimen mentioned this pull request Apr 18, 2023
Closed
@szaimen szaimen deleted the update/psr-container branch April 18, 2023 10:33
@szaimen
Copy link
Contributor

szaimen commented Apr 18, 2023

3rdparty was merged. @susnux can you please do the follow-up?

@susnux
Copy link
Contributor Author

susnux commented Apr 18, 2023

@szaimen sure

@susnux susnux mentioned this pull request Apr 18, 2023
Merged
@susnux
Copy link
Contributor Author

susnux commented Apr 18, 2023

Done in #37794

@DaphneMuller
Copy link

Hello!
Thank you for your work on this! I noticed that your PR still has the label 'documentation'. I'm not sure if you already had a look at the documentation for your PR, but at Nextcloud we strive to document changes that affect other app developers or other admins before the release takes place, and I'm pinging you with the hope to get this done.

Are you familiar with our documentation process already?
Changes that affect app developers should be documented here:
https://docs.nextcloud.com/server/27/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_27.html

Changes that affect administrators should be documented here:
https://docs.nextcloud.com/server/latest/admin_manual/release_notes/upgrade_to_27.html

While I understand sometimes it's handy to merge fast to get your changes in, it would be great if next time you could try to add the documentation before merging. You can find more information on that here:
https://docs.nextcloud.com/server/27/developer_manual/prologue/compatibility_app_ecosystem.html#documentation-procedures-of-changes-that-affect-app-developers

If all your documentation efforts are done, please remove the label 'documentation' and check the checkbox in your opening note and I'll stop bugging you :)

Many thanks in advance and thanks again for your work!

@susnux susnux removed the pending documentation This pull request needs an associated documentation update label May 30, 2023
@joshtrichards joshtrichards mentioned this pull request Jul 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@come-nc come-nc come-nc approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees
No one assigned
Labels
2. developing Work in progress dependencies feature: dependencies
Projects
None yet
Milestone
Nextcloud 27
Development

Successfully merging this pull request may close these issues.
6 participants
@susnux @ChristophWurst @come-nc @szaimen @DaphneMuller @nickvergessen