diff --git a/tests/acceptance/features/bootstrap/OccContext.php b/tests/acceptance/features/bootstrap/OccContext.php
index bcb74bd49b78..13df372014f7 100644
--- a/tests/acceptance/features/bootstrap/OccContext.php
+++ b/tests/acceptance/features/bootstrap/OccContext.php
@@ -985,7 +985,7 @@ public function theOrphanedRemoteStorageShouldBeCleared(int $noOfOrphanedShare):
 		// calculating total no of shares deleted from remote storage: first getting total length of the array
 		// then minus 2 for first two lines of scan info message
 		// then divide by 2 because each share delete has message of two line
-		$totalSharesDeleted = (count($outputLines)-2)/2;
+		$totalSharesDeleted = (\count($outputLines) - 2) / 2;
 		Assert::assertEquals(
 			$noOfOrphanedShare,
 			$totalSharesDeleted,
@@ -1025,6 +1025,7 @@ public function theAdministratorHasSetTheDefaultFolderForReceivedSharesTo(string
 	 * @param int $depth_infinity_allowed
 	 *
 	 * @return void
+	 * @throws Exception
 	 */
 	public function theAdministratorHasSetDepthInfinityAllowedTo($depth_infinity_allowed) {
 		$this->addSystemConfigKeyUsingTheOccCommand(
@@ -2245,10 +2246,10 @@ public function administratorHasDeletedLocalStorageFolderUsingTheOccCommand(stri
 	 * @param string $folder
 	 * @param bool $mustExist
 	 *
-	 * @return integer
+	 * @return integer|bool
 	 * @throws Exception
 	 */
-	public function deleteLocalStorageFolderUsingTheOccCommand(string $folder, bool $mustExist = true):int {
+	public function deleteLocalStorageFolderUsingTheOccCommand(string $folder, bool $mustExist = true) {
 		$createdLocalStorage = [];
 		$this->listLocalStorageMount();
 		$commandOutput = \json_decode($this->featureContext->getStdOutOfOccCommand());
@@ -2572,7 +2573,6 @@ public function theAdministratorDeletesAllTheVersionsForUser(string $user):void
 	/**
 	 * @When the administrator cleanups all the orphaned remote storages of shares
 	 *
-	 *
 	 * @return void
 	 * @throws Exception
 	 */
@@ -2841,10 +2841,10 @@ public function theAdministratorHasClearedTheVersionsForAllUsers():void {
 	 *
 	 * @param string $job
 	 *
-	 * @return string
+	 * @return string|bool
 	 * @throws Exception
 	 */
-	public function getLastJobIdForJob(string $job):string {
+	public function getLastJobIdForJob(string $job) {
 		$this->getAllJobsInBackgroundQueueUsingOccCommand();
 		$commandOutput = $this->featureContext->getStdOutOfOccCommand();
 		$lines = SetupHelper::findLines(