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.

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

Switch from OC::$server->get to OCP\Server::get #3801

Merged
merged 3 commits into from
May 13, 2022
Merged

Conversation

CarlSchwan
Copy link
Member

  • Target version: master

Summary

Switch from OC::$server->get to OCP\Server::get

And add a bit more typing to some classes

TODO

  • Make the test works

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Tests (unit, integration, api and/or acceptance) are included
  • Documentation (manuals or wiki) has been updated or is not required

@CarlSchwan CarlSchwan self-assigned this May 11, 2022
@CarlSchwan CarlSchwan force-pushed the cleanup/server-di branch 2 times, most recently from 8181538 to a15269c Compare May 11, 2022 11:46
@CarlSchwan
Copy link
Member Author

Ended up fixing a few more psalm issues 😆

@juliusknorr
Copy link
Member

🤩 Very nice, also with the stub for circles

@CarlSchwan CarlSchwan force-pushed the cleanup/server-di branch 3 times, most recently from 5c96d78 to 03733ef Compare May 11, 2022 14:05
@CarlSchwan
Copy link
Member Author

The remaining integration failure are looking to be related to server change

Undefined mixin icon-black-white: apps/deck/css/deck.scss This needs to be ported away from scss compiled by the server

@juliusknorr
Copy link
Member

Fixes for icon issues are in #3803

@juliusknorr
Copy link
Member

Pushed a fix for the tests to use the SymfonyAdapter in the template and opened nextcloud/server#32349 to get rid of that one.

CarlSchwan and others added 2 commits May 12, 2022 10:55
And add a bit more typing to some classes + psalm issues

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@cypress
Copy link

cypress bot commented May 12, 2022



Test summary

5 0 0 0


Run details

Project deck
Status Passed
Commit 5df120bca9 ℹ️
Started May 13, 2022 9:58 AM
Ended May 13, 2022 10:00 AM
Duration 01:19 💡
OS Linux Ubuntu - 20.04
Browser Electron 94

View run in Cypress Dashboard ➡️


This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@juliusknorr juliusknorr force-pushed the cleanup/server-di branch 2 times, most recently from e14adf2 to 0940ca4 Compare May 12, 2022 09:13
@juliusknorr juliusknorr force-pushed the cleanup/server-di branch 2 times, most recently from 750ad32 to d80960c Compare May 13, 2022 07:40
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr merged commit 2b531c5 into master May 13, 2022
@delete-merged-branch delete-merged-branch bot deleted the cleanup/server-di branch May 13, 2022 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants