Merge branch 'master' into excludedisabled

Author: NoahOksuz

apps/dav/lib/Upload/UploadHome.php

@@ -14,6 +14,7 @@
 use OCP\Files\NotFoundException;
 use OCP\IUserSession;
 use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\ICollection;
 
 class UploadHome implements ICollection {
@@ -72,7 +73,12 @@ public function getChildren(): array {
 	}
 
 	public function childExists($name): bool {
-		return !is_null($this->getChild($name));
+		try {
+			$this->getChild($name);
+			return true;
+		} catch (NotFound $e) {
+			return false;
+		}
 	}
 
 	public function delete() {

build/integration/features/bootstrap/BasicStructure.php

@@ -475,6 +475,13 @@ public function sleepForSeconds($seconds) {
 		sleep((int)$seconds);
 	}
 
+	/**
+	 * @BeforeSuite
+	 */
+	public static function createPHPUnitConfiguration(): void {
+		(new \PHPUnit\TextUI\Configuration\Builder())->build([]);
+	}
+
 	/**
 	 * @BeforeSuite
 	 */

lib/private/Share20/Manager.php

@@ -1265,16 +1265,16 @@ public function getSharesBy($userId, $shareType, $path = null, $reshares = false
 		while (true) {
 			$added = 0;
 			foreach ($shares as $share) {
+				$added++;
 				if ($onlyValid) {
 					try {
-						$this->checkShare($share);
+						$this->checkShare($share, $added);
 					} catch (ShareNotFound $e) {
 						// Ignore since this basically means the share is deleted
 						continue;
 					}
 				}
 
-				$added++;
 				$shares2[] = $share;
 
 				if (count($shares2) === $limit) {
@@ -1480,11 +1480,14 @@ public function getShareByToken($token) {
 	/**
 	 * Check expire date and disabled owner
 	 *
+	 * @param int &$added If given, will be decremented if the share is deleted
 	 * @throws ShareNotFound
 	 */
-	protected function checkShare(IShare $share): void {
+	private function checkShare(IShare $share, int &$added = 1): void {
 		if ($share->isExpired()) {
 			$this->deleteShare($share);
+			// Remove 1 to added, because this share was deleted
+			$added--;
 			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
 		}
 		if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'no') === 'yes') {