Merge branch 'master' into v4

Author: itsgoingd

CHANGELOG.md

@@ -1,3 +1,7 @@
+4.1.3
+
+- fixed file storage not unlocking index when cleanup has nothing to clean (implemented by Nacoma, thanks!)
+
 4.1.2
 
 - fixed interaction when making HTTP requests in feature tests when collecting tests in Laravel

Clockwork/Clockwork.php

@@ -21,7 +21,7 @@ class Clockwork implements LoggerInterface
 	/**
 	 * Clockwork version
 	 */
-	const VERSION = '4.1.2';
+	const VERSION = '4.1.3';
 
 	/**
 	 * Array of data sources, these objects provide data to be stored in a request object

Clockwork/Storage/FileStorage.php

@@ -106,7 +106,7 @@ public function cleanup($force = false)
 			new Search([ 'received' => [ '<' . date('c', $expirationTime) ] ], [ 'stopOnFirstMismatch' => true ])
 		);
 
-		if (! count($old)) return;
+		if (! count($old)) return $this->closeIndex(true);
 
 		$this->readPreviousIndex();
 		$this->trimIndex();