refactoring

Author: dg

src/Bridges/CacheLatte/CacheMacro.php

@@ -126,16 +126,18 @@ public static function createCache(
 	public static function endCache(array &$parents, array $args = null): void
 	{
 		$helper = array_pop($parents);
-		if ($helper instanceof Nette\Caching\OutputHelper) {
-			if (isset($args['dependencies'])) {
-				$args += $args['dependencies']();
-			}
-			if (isset($args['expire'])) {
-				$args['expiration'] = $args['expire']; // back compatibility
-			}
-			$helper->dependencies[Cache::TAGS] = $args['tags'] ?? null;
-			$helper->dependencies[Cache::EXPIRATION] = $args['expiration'] ?? '+ 7 days';
-			$helper->end();
+		if (!$helper instanceof Nette\Caching\OutputHelper) {
+			return;
+		}
+
+		if (isset($args['dependencies'])) {
+			$args += $args['dependencies']();
+		}
+		if (isset($args['expire'])) {
+			$args['expiration'] = $args['expire']; // back compatibility
 		}
+		$helper->dependencies[Cache::TAGS] = $args['tags'] ?? null;
+		$helper->dependencies[Cache::EXPIRATION] = $args['expiration'] ?? '+ 7 days';
+		$helper->end();
 	}
 }

src/Caching/Storages/FileStorage.php

@@ -132,10 +132,12 @@ public function lock(string $key): void
 			@mkdir($dir); // @ - directory may already exist
 		}
 		$handle = fopen($cacheFile, 'c+b');
-		if ($handle) {
-			$this->locks[$key] = $handle;
-			flock($handle, LOCK_EX);
+		if (!$handle) {
+			return;
 		}
+
+		$this->locks[$key] = $handle;
+		flock($handle, LOCK_EX);
 	}
 
 
@@ -269,12 +271,14 @@ public function clean(array $conditions): void
 		} elseif ($namespaces) {
 			foreach ($namespaces as $namespace) {
 				$dir = $this->dir . '/_' . urlencode($namespace);
-				if (is_dir($dir)) {
-					foreach (Nette\Utils\Finder::findFiles('_*')->in($dir) as $entry) {
-						$this->delete((string) $entry);
-					}
-					@rmdir($dir); // may already contain new files
+				if (!is_dir($dir)) {
+					continue;
+				}
+
+				foreach (Nette\Utils\Finder::findFiles('_*')->in($dir) as $entry) {
+					$this->delete((string) $entry);
 				}
+				@rmdir($dir); // may already contain new files
 			}
 		}
 
@@ -358,12 +362,14 @@ private static function delete(string $file, $handle = null): void
 		if (!$handle) {
 			$handle = @fopen($file, 'r+'); // @ - file may not exist
 		}
-		if ($handle) {
-			flock($handle, LOCK_EX);
-			ftruncate($handle, 0);
-			flock($handle, LOCK_UN);
-			fclose($handle);
-			@unlink($file); // @ - file may not already exist
+		if (!$handle) {
+			return;
 		}
+
+		flock($handle, LOCK_EX);
+		ftruncate($handle, 0);
+		flock($handle, LOCK_UN);
+		fclose($handle);
+		@unlink($file); // @ - file may not already exist
 	}
 }

src/Caching/Storages/SQLiteStorage.php

@@ -56,12 +56,14 @@ public function read(string $key)
 	{
 		$stmt = $this->pdo->prepare('SELECT data, slide FROM cache WHERE key=? AND (expire IS NULL OR expire >= ?)');
 		$stmt->execute([$key, time()]);
-		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			if ($row['slide'] !== null) {
-				$this->pdo->prepare('UPDATE cache SET expire = ? + slide WHERE key=?')->execute([time(), $key]);
-			}
-			return unserialize($row['data']);
+		if (!$row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			return;
+		}
+
+		if ($row['slide'] !== null) {
+			$this->pdo->prepare('UPDATE cache SET expire = ? + slide WHERE key=?')->execute([time(), $key]);
 		}
+		return unserialize($row['data']);
 	}