Merge pull request #38861 from owncloud/release-10.8.0

Merge back Release 10.8.0
owncloud · Jul 21, 2021 · ba8e48e · ba8e48e
2 parents 79d3c63 + 871196b
commit ba8e48e
Show file tree

Hide file tree

Showing 74 changed files with 331 additions and 258 deletions.
diff --git a/.gitignore b/.gitignore
@@ -125,7 +125,6 @@ vendor-bin/**/composer.lock
 
 # Tests - auto-generated files
 /data-autotest
-/tests/.phpunit.result.cache
 /tests/coverage*
 /tests/karma-coverage
 /tests/acceptance/server_tmp
@@ -138,7 +137,7 @@ vendor-bin/**/composer.lock
 clover.xml
 /tests/output
 .php-cs-fixer.cache
-
+.phpunit.result.cache
 # old php-cs-fixer v2 files
 .php_cs.cache
 .php_cs

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
@@ -408,6 +408,7 @@ table td.filename .nametext {
 	text-overflow: clip;
 	max-width: 800px;
 	height: 100%;
+	width: 100%;
 }
 
 .has-favorites #fileList td.filename a.name {

diff --git a/apps/files/lib/Command/VerifyChecksums.php b/apps/files/lib/Command/VerifyChecksums.php
@@ -155,7 +155,14 @@ private function verifyChecksumsForFile($file, InputInterface $input, OutputInte
 			return;
 		}
 
-		if (!self::fileExistsOnDisk($file)) {
+		try {
+			$fileExistsOnDisk = self::fileExistsOnDisk($file);
+		} catch (StorageNotAvailableException $e) {
+			$output->writeln("Skipping $storageId/$path => Storage is not available", OutputInterface::VERBOSITY_VERBOSE);
+			return;
+		}
+
+		if (!$fileExistsOnDisk) {
 			$output->writeln("Skipping $storageId/$path => File is in file-cache but doesn't exist on storage/disk", OutputInterface::VERBOSITY_VERBOSE);
 			return;
 		}

diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php
@@ -105,18 +105,19 @@ public function run($argument) {
 
 		$shares = $qb->execute();
 		while ($share = $shares->fetch()) {
+			$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 			try {
 				/*
 				 * The type of $share['id'] changes depends on the db type. (int for pgsql, string for others)
 				 * This situation led to problem when stubbing method in tests.
 				 * $share['id'] has been casted to string to ensure consistency.
 				 */
 				$shareObject = $this->defaultShareProvider->getShareById((string)$share['id']);
-				$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 				$this->shareManager->deleteShare($shareObject);
-				$this->activityManager->restoreAgentAuthor();
 			} catch (ShareNotFound $ex) {
 				//already deleted
+			} finally {
+				$this->activityManager->restoreAgentAuthor();
 			}
 		}
 		$shares->closeCursor();

diff --git a/changelog/unreleased/38465 → changelog/10.8.0_2021-07-15/38465 b/changelog/unreleased/38465 → changelog/10.8.0_2021-07-15/38465
diff --git a/changelog/unreleased/38474 → changelog/10.8.0_2021-07-15/38474 b/changelog/unreleased/38474 → changelog/10.8.0_2021-07-15/38474
diff --git a/changelog/unreleased/38506 → changelog/10.8.0_2021-07-15/38506 b/changelog/unreleased/38506 → changelog/10.8.0_2021-07-15/38506
diff --git a/changelog/unreleased/38552 → changelog/10.8.0_2021-07-15/38552 b/changelog/unreleased/38552 → changelog/10.8.0_2021-07-15/38552
diff --git a/changelog/unreleased/38567 → changelog/10.8.0_2021-07-15/38567 b/changelog/unreleased/38567 → changelog/10.8.0_2021-07-15/38567
diff --git a/changelog/unreleased/38581 → changelog/10.8.0_2021-07-15/38581 b/changelog/unreleased/38581 → changelog/10.8.0_2021-07-15/38581
diff --git a/changelog/unreleased/38591 → changelog/10.8.0_2021-07-15/38591 b/changelog/unreleased/38591 → changelog/10.8.0_2021-07-15/38591
diff --git a/changelog/unreleased/38598-1 → changelog/10.8.0_2021-07-15/38598-1 b/changelog/unreleased/38598-1 → changelog/10.8.0_2021-07-15/38598-1
diff --git a/changelog/unreleased/38598-2 → changelog/10.8.0_2021-07-15/38598-2 b/changelog/unreleased/38598-2 → changelog/10.8.0_2021-07-15/38598-2
diff --git a/changelog/unreleased/38600 → changelog/10.8.0_2021-07-15/38600 b/changelog/unreleased/38600 → changelog/10.8.0_2021-07-15/38600
diff --git a/changelog/unreleased/38602 → changelog/10.8.0_2021-07-15/38602 b/changelog/unreleased/38602 → changelog/10.8.0_2021-07-15/38602
diff --git a/changelog/unreleased/38605 → changelog/10.8.0_2021-07-15/38605 b/changelog/unreleased/38605 → changelog/10.8.0_2021-07-15/38605
@@ -5,4 +5,5 @@ were triggered by an automation (like the workflow app e.g.).
 
 https://github.com/owncloud/core/pull/38605
 https://github.com/owncloud/core/pull/38630
+https://github.com/owncloud/core/pull/38970
 https://github.com/owncloud/enterprise/issues/4222
diff --git a/changelog/unreleased/38616 → changelog/10.8.0_2021-07-15/38616 b/changelog/unreleased/38616 → changelog/10.8.0_2021-07-15/38616
diff --git a/changelog/unreleased/38625 → changelog/10.8.0_2021-07-15/38625 b/changelog/unreleased/38625 → changelog/10.8.0_2021-07-15/38625
diff --git a/changelog/unreleased/38631 → changelog/10.8.0_2021-07-15/38631 b/changelog/unreleased/38631 → changelog/10.8.0_2021-07-15/38631
diff --git a/changelog/unreleased/38639 → changelog/10.8.0_2021-07-15/38639 b/changelog/unreleased/38639 → changelog/10.8.0_2021-07-15/38639
diff --git a/changelog/unreleased/38643 → changelog/10.8.0_2021-07-15/38643 b/changelog/unreleased/38643 → changelog/10.8.0_2021-07-15/38643
diff --git a/changelog/unreleased/38647 → changelog/10.8.0_2021-07-15/38647 b/changelog/unreleased/38647 → changelog/10.8.0_2021-07-15/38647
diff --git a/changelog/unreleased/38649 → changelog/10.8.0_2021-07-15/38649 b/changelog/unreleased/38649 → changelog/10.8.0_2021-07-15/38649
diff --git a/changelog/unreleased/38653 → changelog/10.8.0_2021-07-15/38653 b/changelog/unreleased/38653 → changelog/10.8.0_2021-07-15/38653
diff --git a/changelog/unreleased/38656 → changelog/10.8.0_2021-07-15/38656 b/changelog/unreleased/38656 → changelog/10.8.0_2021-07-15/38656
diff --git a/changelog/unreleased/38682 → changelog/10.8.0_2021-07-15/38682 b/changelog/unreleased/38682 → changelog/10.8.0_2021-07-15/38682
diff --git a/changelog/unreleased/38689 → changelog/10.8.0_2021-07-15/38689 b/changelog/unreleased/38689 → changelog/10.8.0_2021-07-15/38689
diff --git a/changelog/unreleased/38691 → changelog/10.8.0_2021-07-15/38691 b/changelog/unreleased/38691 → changelog/10.8.0_2021-07-15/38691
diff --git a/changelog/unreleased/38693 → changelog/10.8.0_2021-07-15/38693 b/changelog/unreleased/38693 → changelog/10.8.0_2021-07-15/38693
diff --git a/changelog/unreleased/38698 → changelog/10.8.0_2021-07-15/38698 b/changelog/unreleased/38698 → changelog/10.8.0_2021-07-15/38698
diff --git a/changelog/unreleased/38705 → changelog/10.8.0_2021-07-15/38705 b/changelog/unreleased/38705 → changelog/10.8.0_2021-07-15/38705
diff --git a/changelog/unreleased/38709 → changelog/10.8.0_2021-07-15/38709 b/changelog/unreleased/38709 → changelog/10.8.0_2021-07-15/38709
diff --git a/changelog/unreleased/38714 → changelog/10.8.0_2021-07-15/38714 b/changelog/unreleased/38714 → changelog/10.8.0_2021-07-15/38714
diff --git a/changelog/unreleased/38719 → changelog/10.8.0_2021-07-15/38719 b/changelog/unreleased/38719 → changelog/10.8.0_2021-07-15/38719
diff --git a/changelog/unreleased/38722 → changelog/10.8.0_2021-07-15/38722 b/changelog/unreleased/38722 → changelog/10.8.0_2021-07-15/38722
diff --git a/changelog/unreleased/38725 → changelog/10.8.0_2021-07-15/38725 b/changelog/unreleased/38725 → changelog/10.8.0_2021-07-15/38725
diff --git a/changelog/unreleased/38728 → changelog/10.8.0_2021-07-15/38728 b/changelog/unreleased/38728 → changelog/10.8.0_2021-07-15/38728
diff --git a/changelog/unreleased/38737 → changelog/10.8.0_2021-07-15/38737 b/changelog/unreleased/38737 → changelog/10.8.0_2021-07-15/38737
diff --git a/changelog/unreleased/38738 → changelog/10.8.0_2021-07-15/38738 b/changelog/unreleased/38738 → changelog/10.8.0_2021-07-15/38738
diff --git a/changelog/unreleased/38742 → changelog/10.8.0_2021-07-15/38742 b/changelog/unreleased/38742 → changelog/10.8.0_2021-07-15/38742
diff --git a/changelog/unreleased/38748 → changelog/10.8.0_2021-07-15/38748 b/changelog/unreleased/38748 → changelog/10.8.0_2021-07-15/38748
diff --git a/changelog/unreleased/38750 → changelog/10.8.0_2021-07-15/38750 b/changelog/unreleased/38750 → changelog/10.8.0_2021-07-15/38750
diff --git a/changelog/unreleased/38751 → changelog/10.8.0_2021-07-15/38751 b/changelog/unreleased/38751 → changelog/10.8.0_2021-07-15/38751
diff --git a/changelog/unreleased/38753 → changelog/10.8.0_2021-07-15/38753 b/changelog/unreleased/38753 → changelog/10.8.0_2021-07-15/38753
diff --git a/changelog/unreleased/38767 → changelog/10.8.0_2021-07-15/38767 b/changelog/unreleased/38767 → changelog/10.8.0_2021-07-15/38767
diff --git a/changelog/unreleased/38774 → changelog/10.8.0_2021-07-15/38774 b/changelog/unreleased/38774 → changelog/10.8.0_2021-07-15/38774
@@ -4,4 +4,5 @@ Implemented an action to resend the invitation email for a user that has
 never been logged in yet.
 
 https://github.com/owncloud/core/pull/38774
+https://github.com/owncloud/core/pull/38963
 https://github.com/owncloud/enterprise/issues/4577
diff --git a/changelog/unreleased/38775 → changelog/10.8.0_2021-07-15/38775 b/changelog/unreleased/38775 → changelog/10.8.0_2021-07-15/38775
diff --git a/changelog/unreleased/38778 → changelog/10.8.0_2021-07-15/38778 b/changelog/unreleased/38778 → changelog/10.8.0_2021-07-15/38778
diff --git a/changelog/unreleased/38785 → changelog/10.8.0_2021-07-15/38785 b/changelog/unreleased/38785 → changelog/10.8.0_2021-07-15/38785
@@ -4,4 +4,5 @@ The command now skips files with exceptions instead of crashing.
 A proper message will be displayed to the user who fires the command.
 
 https://github.com/owncloud/core/pull/38785
+https://github.com/owncloud/core/pull/39005
 https://github.com/owncloud/core/issues/38782
diff --git a/changelog/unreleased/38787 → changelog/10.8.0_2021-07-15/38787 b/changelog/unreleased/38787 → changelog/10.8.0_2021-07-15/38787
diff --git a/changelog/unreleased/38788 → changelog/10.8.0_2021-07-15/38788 b/changelog/unreleased/38788 → changelog/10.8.0_2021-07-15/38788
diff --git a/changelog/unreleased/38794 → changelog/10.8.0_2021-07-15/38794 b/changelog/unreleased/38794 → changelog/10.8.0_2021-07-15/38794
diff --git a/changelog/unreleased/38795 → changelog/10.8.0_2021-07-15/38795 b/changelog/unreleased/38795 → changelog/10.8.0_2021-07-15/38795
diff --git a/changelog/unreleased/38804 → changelog/10.8.0_2021-07-15/38804 b/changelog/unreleased/38804 → changelog/10.8.0_2021-07-15/38804
diff --git a/changelog/unreleased/38819 → changelog/10.8.0_2021-07-15/38819 b/changelog/unreleased/38819 → changelog/10.8.0_2021-07-15/38819
diff --git a/changelog/unreleased/38831 → changelog/10.8.0_2021-07-15/38831 b/changelog/unreleased/38831 → changelog/10.8.0_2021-07-15/38831
diff --git a/changelog/unreleased/38841 → changelog/10.8.0_2021-07-15/38841 b/changelog/unreleased/38841 → changelog/10.8.0_2021-07-15/38841
diff --git a/changelog/unreleased/38844 → changelog/10.8.0_2021-07-15/38844 b/changelog/unreleased/38844 → changelog/10.8.0_2021-07-15/38844
diff --git a/changelog/unreleased/38858 → changelog/10.8.0_2021-07-15/38858 b/changelog/unreleased/38858 → changelog/10.8.0_2021-07-15/38858
diff --git a/changelog/unreleased/38860 → changelog/10.8.0_2021-07-15/38860 b/changelog/unreleased/38860 → changelog/10.8.0_2021-07-15/38860
diff --git a/changelog/unreleased/38880 → changelog/10.8.0_2021-07-15/38880 b/changelog/unreleased/38880 → changelog/10.8.0_2021-07-15/38880
diff --git a/changelog/unreleased/38917 → changelog/10.8.0_2021-07-15/38917 b/changelog/unreleased/38917 → changelog/10.8.0_2021-07-15/38917
diff --git a/changelog/unreleased/38922 → changelog/10.8.0_2021-07-15/38922 b/changelog/unreleased/38922 → changelog/10.8.0_2021-07-15/38922
diff --git a/changelog/unreleased/38934 → changelog/10.8.0_2021-07-15/38934 b/changelog/unreleased/38934 → changelog/10.8.0_2021-07-15/38934
diff --git a/changelog/10.8.0_2021-07-15/38962 b/changelog/10.8.0_2021-07-15/38962
@@ -0,0 +1,5 @@
+Change: Update url for sync client button and docs
+
+
+https://github.com/owncloud/core/pull/38962
+https://github.com/owncloud/core/issues/38957
diff --git a/.../unreleased/PHPdependencies20210625onward → ..._2021-07-15/PHPdependencies20210625onward b/.../unreleased/PHPdependencies20210625onward → ..._2021-07-15/PHPdependencies20210625onward
diff --git a/core/css/header.css b/core/css/header.css
@@ -410,7 +410,8 @@
 	opacity: .7;
 	box-sizing: border-box;
 }
-#expanddiv a img, .icon {
+#expanddiv a img,
+#expanddiv a .icon {
 	display: inline-block;
 	margin-bottom: -3px;
 	margin-right: 6px;

diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -1263,12 +1263,13 @@ public function getAllSharesBy($userId, $shareTypes, $nodeIDs, $reshares = false
 			$queriedShares = $provider->getAllSharesBy($userId, $shareTypeArray, $nodeIDs, $reshares);
 			foreach ($queriedShares as $queriedShare) {
 				if (self::shareHasExpired($queriedShare)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($queriedShare);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1304,12 +1305,13 @@ public function getSharesBy($userId, $shareType, $path = null, $reshares = false
 			foreach ($shares as $share) {
 				// Check if the share is expired and if so delete it
 				if (self::shareHasExpired($share)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($share);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1365,12 +1367,13 @@ public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $o
 			foreach ($shares as $share) {
 				// Check if the share is expired and if so delete it
 				if (self::shareHasExpired($share)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($share);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1424,12 +1427,13 @@ public function getAllSharedWith($userId, $shareTypes, $node = null) {
 			$queriedShares = $provider->getAllSharedWith($userId, $node);
 			foreach ($queriedShares as $queriedShare) {
 				if (self::shareHasExpired($queriedShare)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($queriedShare);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1456,8 +1460,11 @@ public function getShareById($id, $recipient = null) {
 		// Validate shares expiration date
 		if (self::shareHasExpired($share)) {
 			$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
-			$this->deleteShare($share);
-			$this->activityManager->restoreAgentAuthor();
+			try {
+				$this->deleteShare($share);
+			} finally {
+				$this->activityManager->restoreAgentAuthor();
+			}
 			throw new ShareNotFound();
 		}
 
@@ -1514,8 +1521,11 @@ public function getShareByToken($token) {
 
 		if (self::shareHasExpired($share)) {
 			$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
-			$this->deleteShare($share);
-			$this->activityManager->restoreAgentAuthor();
+			try {
+				$this->deleteShare($share);
+			} finally {
+				$this->activityManager->restoreAgentAuthor();
+			}
 			throw new ShareNotFound();
 		}