Run rector on lib/private by CarlSchwan · Pull Request #56496 · nextcloud/server

CarlSchwan · 2025-11-17T14:34:08Z

Resolves: #

Summary

Seems to work fine locally and the CI is also happy

I ended up doing some manual changes to lib/private/Group/Group.php, to lib/private/Server.php and to lib/private/AppFramework/DependencyInjection/DIContainer.php to make it work

TODO

...

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)
Labels added where applicable (ex: bug/enhancement, 3. to review, feature component)
Milestone added for target branch/version (ex: 32.x for stable32)

lib/public/AppFramework/IAppContainer.php

provokateurin · 2025-11-18T12:19:44Z

We were always a bit hesitant to do this, but I guess we just have to do it at some point. I'm fine with doing it now, if there is anything wrong we hopefully have enough time until 33.
GH isn't able to let me see the entire second commit, so I can only really yolo this one.

CarlSchwan · 2025-11-18T14:16:20Z

We were always a bit hesitant to do this, but I guess we just have to do it at some point. I'm fine with doing it now, if there is anything wrong we hopefully have enough time until 33. GH isn't able to let me see the entire second commit, so I can only really yolo this one.

We do need to bit the bullet at some point :)

miaulalala

First batch

apps/dav/lib/Connector/Sabre/TagsPlugin.php

apps/federation/lib/SyncFederationAddressBooks.php

apps/settings/lib/Controller/ChangePasswordController.php

apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php

apps/user_ldap/lib/Access.php

lib/private/Diagnostics/EventLogger.php

lib/private/Diagnostics/Query.php

lib/private/DirectEditing/Token.php

lib/private/Encryption/EncryptionEventListener.php

lib/private/Encryption/EncryptionWrapper.php

miaulalala

First batch

miaulalala

Batch 2 🥇

lib/private/Config.php

lib/private/Encryption/Util.php

lib/private/L10N/L10NString.php

lib/private/L10N/LanguageIterator.php

lib/private/L10N/LazyL10N.php

lib/private/Memcache/Cache.php

miaulalala

Batch 2 🥇

miaulalala

Small nitpick, looks good!

lib/private/NavigationManager.php

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

susnux

Changes look sane

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

OC\ServerContainer is not inherinting from IServerContainer so expose the most near type. Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

- repairs job - database - redis And remove Helpertest which was unused outside of some tests. Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

…ting Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

Otherwise we end up with trying to assign null to a property which has strict types. Signed-off-by: Carl Schwan <carlschwan@kde.org>

done

CarlSchwan added this to the Nextcloud 33 milestone Nov 17, 2025

CarlSchwan self-assigned this Nov 17, 2025

CarlSchwan added the 2. developing Work in progress label Nov 17, 2025

CarlSchwan force-pushed the carl/rector branch 2 times, most recently from fe8cd31 to 22cc35c Compare November 18, 2025 10:20

CarlSchwan marked this pull request as ready for review November 18, 2025 11:49

CarlSchwan requested review from a team, Altahrim, ChristophWurst, SebastianKrupinski, miaulalala, nickvergessen and tcitworld as code owners November 18, 2025 11:49

CarlSchwan requested review from provokateurin, salmart-dev and yemkareems and removed request for a team November 18, 2025 11:49

ChristophWurst reviewed Nov 18, 2025

View reviewed changes

lib/public/AppFramework/IAppContainer.php Outdated Show resolved Hide resolved

miaulalala requested changes Nov 18, 2025

View reviewed changes

CarlSchwan force-pushed the carl/rector branch from fd76274 to 71342b0 Compare November 18, 2025 16:41

CarlSchwan requested a review from miaulalala November 19, 2025 10:15

CarlSchwan force-pushed the carl/rector branch 2 times, most recently from ce62cda to 95fbaeb Compare November 19, 2025 10:50

miaulalala requested changes Nov 19, 2025

View reviewed changes

CarlSchwan force-pushed the carl/rector branch from 66dbebd to 3a009c9 Compare November 20, 2025 17:07

CarlSchwan force-pushed the carl/rector branch 2 times, most recently from c2541a5 to c3c30cd Compare December 11, 2025 11:44

miaulalala approved these changes Dec 16, 2025

View reviewed changes

lib/private/NavigationManager.php Outdated Show resolved Hide resolved

CarlSchwan force-pushed the carl/rector branch 4 times, most recently from 0cae89b to c4e1c0b Compare December 19, 2025 12:04

This was referenced Jan 7, 2026

33.0.0 beta 2 #57398

Merged

33.0.0 beta 3 #57441

Merged

This was referenced Jan 14, 2026

33.0.0 beta 4 #57545

Merged

33.0.0 beta 5 #57651

Merged

nextcloud-bot mentioned this pull request Jan 22, 2026

[stable33] 33.0.0 RC1 #57724

Merged

This was referenced Jan 29, 2026

[stable33] 33.0.0 RC2 #57899

Merged

[stable33] 33.0.0 RC3 #58047

Merged

chore(rector): Run rector on apps, core and tests directory

5d0d0c1

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

susnux approved these changes Feb 6, 2026

View reviewed changes

CarlSchwan added 9 commits February 6, 2026 13:50

refactor: Run rector on lib/private

7b60788

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

fix(IAppContainer): Expose more correct type

6e48f9f

OC\ServerContainer is not inherinting from IServerContainer so expose the most near type. Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

refactor: Apply comments

65e769a

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

fix(ExpressionBuilderTest): Fix test and improve typing

fa75c1b

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

fix(ShareAPIControllerTest): Fix return types of DateTimeZone

acda4ff

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

refactor: Apply second batch of comments

3979c49

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

refactor: Update repairs jobs

fb3f9fe

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

refactor: Add more typing

c96ece0

- repairs job - database - redis And remove Helpertest which was unused outside of some tests. Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

refactor(navigation-manager): Cleanup implementation and add type hin…

e56e42e

…ting Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

CarlSchwan force-pushed the carl/rector branch from c4e1c0b to e56e42e Compare February 6, 2026 13:00

fix(WatcherTest): Properly mock getCache and getScanner in IStorage

9a26169

Otherwise we end up with trying to assign null to a property which has strict types. Signed-off-by: Carl Schwan <carlschwan@kde.org>

CarlSchwan merged commit 1dbaf17 into master Feb 6, 2026
212 of 218 checks passed

CarlSchwan deleted the carl/rector branch February 6, 2026 15:09

Uh oh!

Conversation

CarlSchwan commented Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

TODO

Checklist

Uh oh!

Uh oh!

provokateurin commented Nov 18, 2025

Uh oh!

CarlSchwan commented Nov 18, 2025

Uh oh!

miaulalala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miaulalala left a comment

Choose a reason for hiding this comment

Uh oh!

miaulalala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miaulalala left a comment

Choose a reason for hiding this comment

Uh oh!

miaulalala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

susnux left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

CarlSchwan commented Nov 17, 2025 •

edited

Loading