Make this work with php5.4

apps/files/command/scan.php

@@ -146,6 +146,7 @@ protected function scanFiles($user, $path, $verbose, OutputInterface $output, $s
 					$output->writeln("\t<error>Storage \"" . $storage->getCache()->getNumericStorageId() . '" cannot be repaired as it is currently in use, please try again later</error>');
 					return;
 				}
+				$stored = false;
 				try {
 					$repairStep = new RepairMismatchFileCachePath(
 						$connection,
@@ -154,8 +155,15 @@ protected function scanFiles($user, $path, $verbose, OutputInterface $output, $s
 					$repairStep->setStorageNumericId($storage->getCache()->getNumericStorageId());
 					$repairStep->setCountOnly(false);
 					$repairStep->run();
-				} finally {
-					$storage->releaseLock('', ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
+				} catch (\Exception $e) {
+					$stored = $e;
+				}
+
+				// Release the lock first
+				$storage->releaseLock('', ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
+				// Now throw the exception for handling elsewhere
+				if($stored) {
+					throw $stored;
 				}
 			});
 		}

tests/lib/repair/repairmismatchfilecachepathtest.php

@@ -8,12 +8,9 @@
 
 namespace Test\Repair;
 
-
 use OC\Repair\RepairMismatchFileCachePath;
-use \OC\RepairStep;
 use \OCP\IDBConnection;
 use Test\TestCase;
-use OCP\Files\IMimeTypeLoader;
 
 /**
  * Tests for repairing mismatch file cache paths
@@ -24,7 +21,7 @@
  */
 class RepairMismatchFileCachePathTest extends TestCase {
 
-	/** @var RepairStep */
+	/** @var RepairMismatchFileCachePath */
 	private $repair;
 
 	/** @var IDBConnection */
@@ -35,7 +32,7 @@ protected function setUp() {
 
 		$this->connection = \OC::$server->getDatabaseConnection();
 
-		$mimeLoader = $this->getMockBuilder(IMimeTypeLoader::class)->getMock();
+		$mimeLoader = $this->getMockBuilder('OCP\Files\IMimeTypeLoader')->getMock();
 		$mimeLoader->method('getId')
 			->will($this->returnValueMap([
 				['httpd', 1],