coding style

Author: dg

src/Bridges/CacheLatte/CacheMacro.php

@@ -94,8 +94,12 @@ public static function initRuntime(Latte\Runtime\Template $template): void
 	 * Starts the output cache. Returns Nette\Caching\OutputHelper object if buffering was started.
 	 * @return Nette\Caching\OutputHelper|\stdClass
 	 */
-	public static function createCache(Nette\Caching\IStorage $cacheStorage, string $key, ?array &$parents, array $args = null)
-	{
+	public static function createCache(
+		Nette\Caching\IStorage $cacheStorage,
+		string $key,
+		?array &$parents,
+		array $args = null
+	) {
 		if ($args) {
 			if (array_key_exists('if', $args) && !$args['if']) {
 				return $parents[] = new \stdClass;

src/Caching/Cache.php

@@ -74,8 +74,7 @@ final public function getNamespace(): string
 	 */
 	public function derive(string $namespace)
 	{
-		$derived = new static($this->storage, $this->namespace . $namespace);
-		return $derived;
+		return new static($this->storage, $this->namespace . $namespace);
 	}
 
 
@@ -206,7 +205,7 @@ private function completeDependencies(?array $dp): array
 		// convert FILES into CALLBACKS
 		if (isset($dp[self::FILES])) {
 			foreach (array_unique((array) $dp[self::FILES]) as $item) {
-				$dp[self::CALLBACKS][] = [[__CLASS__, 'checkFile'], $item, @filemtime($item) ?: null]; // @ - stat may fail
+				$dp[self::CALLBACKS][] = [[self::class, 'checkFile'], $item, @filemtime($item) ?: null]; // @ - stat may fail
 			}
 			unset($dp[self::FILES]);
 		}
@@ -219,7 +218,7 @@ private function completeDependencies(?array $dp): array
 		// convert CONSTS into CALLBACKS
 		if (isset($dp[self::CONSTS])) {
 			foreach (array_unique((array) $dp[self::CONSTS]) as $item) {
-				$dp[self::CALLBACKS][] = [[__CLASS__, 'checkConst'], $item, constant($item)];
+				$dp[self::CALLBACKS][] = [[self::class, 'checkConst'], $item, constant($item)];
 			}
 			unset($dp[self::CONSTS]);
 		}

src/Caching/Storages/FileStorage.php

@@ -81,12 +81,9 @@ public function __construct(string $dir, IJournal $journal = null)
 	public function read(string $key)
 	{
 		$meta = $this->readMetaAndLock($this->getCacheFile($key), LOCK_SH);
-		if ($meta && $this->verify($meta)) {
-			return $this->readData($meta); // calls fclose()
-
-		} else {
-			return null;
-		}
+		return $meta && $this->verify($meta)
+			? $this->readData($meta) // calls fclose()
+			: null;
 	}
 
 
@@ -327,11 +324,7 @@ protected function readData(array $meta)
 		flock($meta[self::HANDLE], LOCK_UN);
 		fclose($meta[self::HANDLE]);
 
-		if (empty($meta[self::META_SERIALIZED])) {
-			return $data;
-		} else {
-			return unserialize($data);
-		}
+		return empty($meta[self::META_SERIALIZED]) ? $data : unserialize($data);
 	}
 
 

src/Caching/Storages/MemcachedStorage.php

@@ -45,8 +45,12 @@ public static function isAvailable(): bool
 	}
 
 
-	public function __construct(string $host = 'localhost', int $port = 11211, string $prefix = '', IJournal $journal = null)
-	{
+	public function __construct(
+		string $host = 'localhost',
+		int $port = 11211,
+		string $prefix = '',
+		IJournal $journal = null
+	) {
 		if (!static::isAvailable()) {
 			throw new Nette\NotSupportedException("PHP extension 'memcached' is not loaded.");
 		}

src/Caching/Storages/SQLiteStorage.php

@@ -92,8 +92,12 @@ public function lock(string $key): void
 
 	public function write(string $key, $data, array $dependencies): void
 	{
-		$expire = isset($dependencies[Cache::EXPIRATION]) ? $dependencies[Cache::EXPIRATION] + time() : null;
-		$slide = isset($dependencies[Cache::SLIDING]) ? $dependencies[Cache::EXPIRATION] : null;
+		$expire = isset($dependencies[Cache::EXPIRATION])
+			? $dependencies[Cache::EXPIRATION] + time()
+			: null;
+		$slide = isset($dependencies[Cache::SLIDING])
+			? $dependencies[Cache::EXPIRATION]
+			: null;
 
 		$this->pdo->exec('BEGIN TRANSACTION');
 		$this->pdo->prepare('REPLACE INTO cache (key, data, expire, slide) VALUES (?, ?, ?, ?)')

tests/Storages/FileStorage.deadlock.phpt

@@ -21,7 +21,7 @@ try {
 	$cache->load('key', function () {
 		throw new Exception;
 	});
-} catch (Exception $e) {
+} catch (\Throwable $e) {
 }
 
 Assert::noError(function () use ($cache) {