Skip to content

fix: Replace OC_App calls by IAppManager #50999

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

Merged
come-nc merged 4 commits into from
Feb 27, 2025
Merged

fix: Replace OC_App calls by IAppManager #50999

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3413998
fix: Replace OC_App calls by IAppManager
come-nc Feb 24, 2025
e2a4649
fix(tests): Adapt tests to appManager usage
come-nc Feb 24, 2025
3a6345a
fix: Clean up OC_App usage in public.php
come-nc Feb 24, 2025
d189ed3
fix: Remove incorrect `@throws` annotations and move away from OC_App
come-nc Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(tests): Adapt tests to appManager usage 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Feb 24, 2025
commit e2a46492577e95ad5d790befaa62d74eb2393b87
3 changes: 3 additions & 0 deletions apps/files/tests/Controller/ViewControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ protected function setUp(): void {
$this->appManager->expects($this->any())
->method('getAppPath')
->willReturnCallback(fn (string $appid): string => \OC::$SERVERROOT . '/apps/' . $appid);
$this->appManager->expects($this->any())
->method('isAppLoaded')
->willReturn(true);

$this->cacheFactory = $this->createMock(ICacheFactory::class);
$this->logger = $this->createMock(LoggerInterface::class);
Expand Down
3 changes: 3 additions & 0 deletions tests/lib/Route/RouterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ public function testGenerateConsecutively(): void {
$this->appManager->expects(self::atLeastOnce())
->method('getAppPath')
->willReturnCallback(fn (string $appid): string => \OC::$SERVERROOT . '/apps/' . $appid);
$this->appManager->expects(self::atLeastOnce())
->method('isAppLoaded')
->willReturn(true);

$this->assertEquals('/index.php/apps/files/', $this->router->generate('files.view.index'));

Expand Down