Skip to content

refactor: Remove most usages of IAppContainer and IServerContainer#60780

Open
CarlSchwan wants to merge 1 commit into
masterfrom
carl/modernize-containers
Open

refactor: Remove most usages of IAppContainer and IServerContainer#60780
CarlSchwan wants to merge 1 commit into
masterfrom
carl/modernize-containers

Conversation

@CarlSchwan
Copy link
Copy Markdown
Member

  • Resolves: #

Summary

TODO

  • ...

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@CarlSchwan CarlSchwan force-pushed the carl/modernize-containers branch 3 times, most recently from d08f117 to aed4795 Compare May 28, 2026 10:00
And port more stuff to standard ContainerInterface interface

Signed-off-by: Carl Schwan <carlschwan@kde.org>
@CarlSchwan CarlSchwan force-pushed the carl/modernize-containers branch from aed4795 to 7d2081f Compare May 28, 2026 10:10
@CarlSchwan CarlSchwan marked this pull request as ready for review May 28, 2026 10:14
@CarlSchwan CarlSchwan requested review from ArtificialOwl, come-nc, leftybournes and salmart-dev and removed request for a team May 28, 2026 10:14
Copy link
Copy Markdown
Member

@provokateurin provokateurin left a comment

Choose a reason for hiding this comment

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

Okay you got me :D

Comment on lines +728 to +730
/** @var IAppContainer $appContainer */
$appContainer = $apps[$appId]
->getContainer();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This var annotation should not be needed. I suspect that the param type needs to be array<string, App>, so that psalm understands the value returned.

Comment on lines +804 to +806
/** @var IContainer $appContainer */
$appContainer = $apps[$appId]
->getContainer();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Same

Comment on lines +830 to +832
/** @var IContainer $appContainer */
$appContainer = $apps[$appId]
->getContainer();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Same

Comment on lines +855 to +857
/** @var IContainer $appContainer */
$appContainer = $apps[$appId]
->getContainer();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Same

Comment on lines +962 to +965
$this->logger->error('User logged out', [
'exception' => new \RuntimeException('Logout'),
'app' => 'core',
]);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why do you log here?

protected $systemConfig;
protected ContainerInterface&MockObject $c;
protected LogFactory $factory;
protected SystemConfig|MockObject $systemConfig;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
protected SystemConfig|MockObject $systemConfig;
protected SystemConfig&MockObject $systemConfig;

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants