Merge pull request #48145 from nextcloud/artonge/fix/drop_unecessary_…

…exit fix: Drop unnecessary exit
nextcloud · Sep 18, 2024 · cd3256b · cd3256b
2 parents 29a03ff + 4e75a3c
commit cd3256b
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 199 deletions.
diff --git a/apps/dav/lib/Files/ErrorPagePlugin.php b/apps/dav/lib/Files/ErrorPagePlugin.php
@@ -92,7 +92,6 @@ public function generateBody(\Throwable $ex, int $httpCode): mixed {
 	 */
 	public function sendResponse() {
 		$this->server->sapi->sendResponse($this->server->httpResponse);
-		exit();
 	}
 
 	private function acceptHtml(): bool {

diff --git a/core/templates/exception.php b/core/templates/exception.php
@@ -9,20 +9,7 @@
 
 style('core', ['styles', 'header', 'exception']);
 
-function print_exception(Throwable $e, \OCP\IL10N $l): void {
-	print_unescaped('<pre>');
-	p($e->getTraceAsString());
-	print_unescaped('</pre>');
-
-	if ($e->getPrevious() !== null) {
-		print_unescaped('<br />');
-		print_unescaped('<h4>');
-		p($l->t('Previous'));
-		print_unescaped('</h4>');
-
-		print_exception($e->getPrevious(), $l);
-	}
-}
+require_once __DIR__ . '/print_exception.php';
 
 ?>
 <div class="guest-box wide">

diff --git a/core/templates/print_exception.php b/core/templates/print_exception.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2012-2015 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+function print_exception(Throwable $e, \OCP\IL10N $l): void {
+	print_unescaped('<pre>');
+	p($e->getTraceAsString());
+	print_unescaped('</pre>');
+
+	if ($e->getPrevious() !== null) {
+		print_unescaped('<br />');
+		print_unescaped('<h4>');
+		p($l->t('Previous'));
+		print_unescaped('</h4>');
+
+		print_exception($e->getPrevious(), $l);
+	}
+}
diff --git a/core/templates/print_xml_exception.php b/core/templates/print_xml_exception.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2012-2015 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+function print_exception(Throwable $e, \OCP\IL10N $l): void {
+	p($e->getTraceAsString());
+
+	if ($e->getPrevious() !== null) {
+		print_unescaped('<s:previous-exception>');
+		print_exception($e->getPrevious(), $l);
+		print_unescaped('</s:previous-exception>');
+	}
+}
diff --git a/core/templates/xml_exception.php b/core/templates/xml_exception.php
@@ -5,15 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-function print_exception(Throwable $e, \OCP\IL10N $l): void {
-	p($e->getTraceAsString());
-
-	if ($e->getPrevious() !== null) {
-		print_unescaped('<s:previous-exception>');
-		print_exception($e->getPrevious(), $l);
-		print_unescaped('</s:previous-exception>');
-	}
-}
+require_once __DIR__ . '/print_xml_exception.php';
 
 print_unescaped('<?xml version="1.0" encoding="utf-8"?>' . "\n");
 ?>

diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php
@@ -353,6 +353,8 @@ public function testSearchInRoot(): void {
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$cache->insert('files', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
 		$cache->insert('files/foo', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
@@ -391,6 +393,8 @@ public function testSearchInStorageRoot(): void {
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
 		$cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
@@ -442,9 +446,13 @@ public function testSearchSubStorages(): void {
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$subStorage->method('getCache')
 			->willReturn($subCache);
+		$subStorage->method('getOwner')
+			->willReturn('owner');
 
 		$cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
 		$cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
@@ -496,6 +504,8 @@ public function testGetById(): void {
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$this->userMountCache->expects($this->any())
 			->method('getMountsForFileId')
@@ -543,6 +553,8 @@ public function testGetByIdMountRoot(): void {
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$this->userMountCache->expects($this->any())
 			->method('getMountsForFileId')
@@ -586,6 +598,8 @@ public function testGetByIdOutsideFolder(): void {
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$this->userMountCache->expects($this->any())
 			->method('getMountsForFileId')
@@ -629,6 +643,8 @@ public function testGetByIdMultipleStorages(): void {
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$this->userMountCache->method('getMountsForFileId')
 			->with(1)
@@ -644,9 +660,6 @@ public function testGetByIdMultipleStorages(): void {
 				),
 			]);
 
-		$storage->method('getCache')
-			->willReturn($cache);
-
 		$cache->method('get')
 			->with(1)
 			->willReturn($fileInfo);
@@ -948,9 +961,13 @@ public function testSearchSubStoragesLimitOffset(int $offset, int $limit, array
 
 		$storage->method('getCache')
 			->willReturn($cache);
+		$storage->method('getOwner')
+			->willReturn('owner');
 
 		$subStorage1->method('getCache')
 			->willReturn($subCache1);
+		$subStorage1->method('getOwner')
+			->willReturn('owner');
 
 		$subMount2->method('getStorage')
 			->willReturn($subStorage2);
@@ -960,6 +977,8 @@ public function testSearchSubStoragesLimitOffset(int $offset, int $limit, array
 
 		$subStorage2->method('getCache')
 			->willReturn($subCache2);
+		$subStorage2->method('getOwner')
+			->willReturn('owner');
 
 		$cache->insert('foo/foo1', ['size' => 200, 'mtime' => 10, 'mimetype' => 'text/plain']);
 		$cache->insert('foo/foo2', ['size' => 200, 'mtime' => 20, 'mimetype' => 'text/plain']);

diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php
@@ -7,6 +7,8 @@
 
 namespace Test\Files\ObjectStore;
 
+use OC\Files\ObjectStore\StorageObjectStore;
+use OC\Files\Storage\Temporary;
 use Test\Files\Storage\StoragesTest;
 
 /**

diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php
@@ -7,6 +7,8 @@
 
 namespace Test\Files\ObjectStore;
 
+use OC\Files\ObjectStore\StorageObjectStore;
+use OC\Files\Storage\Temporary;
 use Test\Files\Storage\StoragesTest;
 
 /**

diff --git a/tests/lib/Files/Storage/StoragesTest.php b/tests/lib/Files/Storage/StoragesTest.php
@@ -33,76 +33,76 @@ protected function tearDown(): void {
 	public function testMoveFileFromStorage() {
 		$source = 'source.txt';
 		$target = 'target.txt';
-		$storage2->file_put_contents($source, 'foo');
+		$this->storage2->file_put_contents($source, 'foo');
 
-		$storage1->moveFromStorage($storage2, $source, $target);
+		$this->storage1->moveFromStorage($this->storage2, $source, $target);
 
-		$this->assertTrue($storage1->file_exists($target), $target.' was not created');
-		$this->assertFalse($storage2->file_exists($source), $source.' still exists');
-		$this->assertEquals('foo', $storage1->file_get_contents($target));
+		$this->assertTrue($this->storage1->file_exists($target), $target.' was not created');
+		$this->assertFalse($this->storage2->file_exists($source), $source.' still exists');
+		$this->assertEquals('foo', $this->storage1->file_get_contents($target));
 	}
 
 	public function testMoveDirectoryFromStorage() {
-		$storage2->mkdir('source');
-		$storage2->file_put_contents('source/test1.txt', 'foo');
-		$storage2->file_put_contents('source/test2.txt', 'qwerty');
-		$storage2->mkdir('source/subfolder');
-		$storage2->file_put_contents('source/subfolder/test.txt', 'bar');
-
-		$storage1->moveFromStorage($storage2, 'source', 'target');
-
-		$this->assertTrue($storage1->file_exists('target'));
-		$this->assertTrue($storage1->file_exists('target/test1.txt'));
-		$this->assertTrue($storage1->file_exists('target/test2.txt'));
-		$this->assertTrue($storage1->file_exists('target/subfolder'));
-		$this->assertTrue($storage1->file_exists('target/subfolder/test.txt'));
-
-		$this->assertFalse($storage2->file_exists('source'));
-		$this->assertFalse($storage2->file_exists('source/test1.txt'));
-		$this->assertFalse($storage2->file_exists('source/test2.txt'));
-		$this->assertFalse($storage2->file_exists('source/subfolder'));
-		$this->assertFalse($storage2->file_exists('source/subfolder/test.txt'));
-
-		$this->assertEquals('foo', $storage1->file_get_contents('target/test1.txt'));
-		$this->assertEquals('qwerty', $storage1->file_get_contents('target/test2.txt'));
-		$this->assertEquals('bar', $storage1->file_get_contents('target/subfolder/test.txt'));
+		$this->storage2->mkdir('source');
+		$this->storage2->file_put_contents('source/test1.txt', 'foo');
+		$this->storage2->file_put_contents('source/test2.txt', 'qwerty');
+		$this->storage2->mkdir('source/subfolder');
+		$this->storage2->file_put_contents('source/subfolder/test.txt', 'bar');
+
+		$this->storage1->moveFromStorage($this->storage2, 'source', 'target');
+
+		$this->assertTrue($this->storage1->file_exists('target'));
+		$this->assertTrue($this->storage1->file_exists('target/test1.txt'));
+		$this->assertTrue($this->storage1->file_exists('target/test2.txt'));
+		$this->assertTrue($this->storage1->file_exists('target/subfolder'));
+		$this->assertTrue($this->storage1->file_exists('target/subfolder/test.txt'));
+
+		$this->assertFalse($this->storage2->file_exists('source'));
+		$this->assertFalse($this->storage2->file_exists('source/test1.txt'));
+		$this->assertFalse($this->storage2->file_exists('source/test2.txt'));
+		$this->assertFalse($this->storage2->file_exists('source/subfolder'));
+		$this->assertFalse($this->storage2->file_exists('source/subfolder/test.txt'));
+
+		$this->assertEquals('foo', $this->storage1->file_get_contents('target/test1.txt'));
+		$this->assertEquals('qwerty', $this->storage1->file_get_contents('target/test2.txt'));
+		$this->assertEquals('bar', $this->storage1->file_get_contents('target/subfolder/test.txt'));
 	}
 
 	public function testCopyFileFromStorage() {
 		$source = 'source.txt';
 		$target = 'target.txt';
-		$storage2->file_put_contents($source, 'foo');
+		$this->storage2->file_put_contents($source, 'foo');
 
-		$storage1->copyFromStorage($storage2, $source, $target);
+		$this->storage1->copyFromStorage($this->storage2, $source, $target);
 
-		$this->assertTrue($storage1->file_exists($target), $target.' was not created');
-		$this->assertTrue($storage2->file_exists($source), $source.' was deleted');
-		$this->assertEquals('foo', $storage1->file_get_contents($target));
+		$this->assertTrue($this->storage1->file_exists($target), $target.' was not created');
+		$this->assertTrue($this->storage2->file_exists($source), $source.' was deleted');
+		$this->assertEquals('foo', $this->storage1->file_get_contents($target));
 	}
 
 	public function testCopyDirectoryFromStorage() {
-		$storage2->mkdir('source');
-		$storage2->file_put_contents('source/test1.txt', 'foo');
-		$storage2->file_put_contents('source/test2.txt', 'qwerty');
-		$storage2->mkdir('source/subfolder');
-		$storage2->file_put_contents('source/subfolder/test.txt', 'bar');
-
-		$storage1->copyFromStorage($storage2, 'source', 'target');
-
-		$this->assertTrue($storage1->file_exists('target'));
-		$this->assertTrue($storage1->file_exists('target/test1.txt'));
-		$this->assertTrue($storage1->file_exists('target/test2.txt'));
-		$this->assertTrue($storage1->file_exists('target/subfolder'));
-		$this->assertTrue($storage1->file_exists('target/subfolder/test.txt'));
-
-		$this->assertTrue($storage2->file_exists('source'));
-		$this->assertTrue($storage2->file_exists('source/test1.txt'));
-		$this->assertTrue($storage2->file_exists('source/test2.txt'));
-		$this->assertTrue($storage2->file_exists('source/subfolder'));
-		$this->assertTrue($storage2->file_exists('source/subfolder/test.txt'));
-
-		$this->assertEquals('foo', $storage1->file_get_contents('target/test1.txt'));
-		$this->assertEquals('qwerty', $storage1->file_get_contents('target/test2.txt'));
-		$this->assertEquals('bar', $storage1->file_get_contents('target/subfolder/test.txt'));
+		$this->storage2->mkdir('source');
+		$this->storage2->file_put_contents('source/test1.txt', 'foo');
+		$this->storage2->file_put_contents('source/test2.txt', 'qwerty');
+		$this->storage2->mkdir('source/subfolder');
+		$this->storage2->file_put_contents('source/subfolder/test.txt', 'bar');
+
+		$this->storage1->copyFromStorage($this->storage2, 'source', 'target');
+
+		$this->assertTrue($this->storage1->file_exists('target'));
+		$this->assertTrue($this->storage1->file_exists('target/test1.txt'));
+		$this->assertTrue($this->storage1->file_exists('target/test2.txt'));
+		$this->assertTrue($this->storage1->file_exists('target/subfolder'));
+		$this->assertTrue($this->storage1->file_exists('target/subfolder/test.txt'));
+
+		$this->assertTrue($this->storage2->file_exists('source'));
+		$this->assertTrue($this->storage2->file_exists('source/test1.txt'));
+		$this->assertTrue($this->storage2->file_exists('source/test2.txt'));
+		$this->assertTrue($this->storage2->file_exists('source/subfolder'));
+		$this->assertTrue($this->storage2->file_exists('source/subfolder/test.txt'));
+
+		$this->assertEquals('foo', $this->storage1->file_get_contents('target/test1.txt'));
+		$this->assertEquals('qwerty', $this->storage1->file_get_contents('target/test2.txt'));
+		$this->assertEquals('bar', $this->storage1->file_get_contents('target/subfolder/test.txt'));
 	}
 }
diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/lib/Repair/RepairMimeTypesTest.php
@@ -8,8 +8,11 @@
 namespace Test\Repair;
 
 use OC\Files\Storage\Temporary;
+use OC\Repair\RepairMimeTypes;
 use OCP\Files\IMimeTypeLoader;
+use OCP\IAppConfig;
 use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
@@ -42,13 +45,21 @@ protected function setUp(): void {
 		$config->method('getSystemValueString')
 			->with('version')
 			->willReturn('11.0.0.0');
-		$config->method('getAppValue')
+
+		$appConfig = $this->getMockBuilder(IAppConfig::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$appConfig->method('getValueString')
 			->with('files', 'mimetype_version')
 			->willReturn('11.0.0.0');
 
-		$this->storage = new \OC\Files\Storage\Temporary([]);
+		$this->storage = new Temporary([]);
 
-		$this->repair = new \OC\Repair\RepairMimeTypes($config, \OC::$server->getDatabaseConnection());
+		$this->repair = new RepairMimeTypes(
+			$config,
+			$appConfig,
+			\OCP\Server::get(IDBConnection::class),
+		);
 	}
 
 	protected function tearDown(): void {