Merge pull request #43532 from nextcloud/chore/remove-dead-code

fix(files): Remove dead code from files controllers
nextcloud · Feb 13, 2024 · 8bcc55b · 8bcc55b
2 parents 932d6e1 + 5e124c4
commit 8bcc55b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -115,26 +115,6 @@ public function __construct(string $appName,
  $this->viewConfig = $viewConfig;
  }
 
- /**
- * @param string $appName
- * @param string $scriptName
- * @return string
- */
- protected function renderScript($appName, $scriptName) {
- $content = '';
- $appPath = \OC_App::getAppPath($appName);
- $scriptPath = $appPath . '/' . $scriptName;
- if (file_exists($scriptPath)) {
- // TODO: sanitize path / script name ?
- ob_start();
- include $scriptPath;
- $content = ob_get_contents();
- @ob_end_clean();
- }
-
- return $content;
- }
-
  /**
  * FIXME: Replace with non static code
  *

diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
@@ -71,9 +71,9 @@ class ViewControllerTest extends TestCase {
  private $eventDispatcher;
  /** @var ViewController|\PHPUnit\Framework\MockObject\MockObject */
  private $viewController;
- /** @var IUser */
+ /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
  private $user;
- /** @var IUserSession */
+ /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
  private $userSession;
  /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
  private $appManager;
@@ -135,7 +135,6 @@ protected function setUp(): void {
  ])
  ->setMethods([
  'getStorageInfo',
- 'renderScript'
  ])
  ->getMock();
  }