used PHP 7.1 features

Author: dg

src/Bridges/CacheLatte/CacheMacro.php

@@ -131,13 +131,13 @@ public static function endCache(&$parents, array $args = NULL)
 		$helper = array_pop($parents);
 		if ($helper instanceof Nette\Caching\OutputHelper) {
 			if (isset($args['dependencies'])) {
-				$args += call_user_func($args['dependencies']);
+				$args += $args['dependencies']();
 			}
 			if (isset($args['expire'])) {
 				$args['expiration'] = $args['expire']; // back compatibility
 			}
-			$helper->dependencies[Cache::TAGS] = isset($args['tags']) ? $args['tags'] : NULL;
-			$helper->dependencies[Cache::EXPIRATION] = isset($args['expiration']) ? $args['expiration'] : '+ 7 days';
+			$helper->dependencies[Cache::TAGS] = $args['tags'] ?? NULL;
+			$helper->dependencies[Cache::EXPIRATION] = $args['expiration'] ?? '+ 7 days';
 			$helper->end();
 		}
 	}

src/Caching/Cache.php

@@ -92,7 +92,7 @@ public function load($key, $fallback = NULL)
 		$data = $this->storage->read($this->generateKey($key));
 		if ($data === NULL && $fallback) {
 			return $this->save($key, function (&$dependencies) use ($fallback) {
-				return call_user_func_array($fallback, [&$dependencies]);
+				return $fallback(...[&$dependencies]);
 			});
 		}
 		return $data;
@@ -122,7 +122,7 @@ public function bulkLoad(array $keys, $fallback = NULL)
 				foreach ($result as $key => $value) {
 					if ($value === NULL) {
 						$result[$key] = $this->save($key, function (&$dependencies) use ($key, $fallback) {
-							return call_user_func_array($fallback, [$key, &$dependencies]);
+							return $fallback(...[$key, &$dependencies]);
 						});
 					}
 				}
@@ -138,7 +138,7 @@ public function bulkLoad(array $keys, $fallback = NULL)
 				$result[$key] = $cacheData[$storageKey];
 			} elseif ($fallback) {
 				$result[$key] = $this->save($key, function (&$dependencies) use ($key, $fallback) {
-					return call_user_func_array($fallback, [$key, &$dependencies]);
+					return $fallback(...[$key, &$dependencies]);
 				});
 			} else {
 				$result[$key] = NULL;
@@ -171,7 +171,7 @@ public function save($key, $data, array $dependencies = NULL)
 		if ($data instanceof \Closure) {
 			$this->storage->lock($key);
 			try {
-				$data = call_user_func_array($data, [&$dependencies]);
+				$data = $data(...[&$dependencies]);
 			} catch (\Throwable $e) {
 				$this->storage->remove($key);
 				throw $e;
@@ -336,7 +336,7 @@ protected function generateKey($key)
 	public static function checkCallbacks($callbacks)
 	{
 		foreach ($callbacks as $callback) {
-			if (!call_user_func_array(array_shift($callback), $callback)) {
+			if (!array_shift($callback)(...$callback)) {
 				return FALSE;
 			}
 		}

src/Caching/Storages/FileStorage.php

@@ -32,7 +32,8 @@ class FileStorage implements Nette\Caching\IStorage
 	 */
 
 	/** @internal cache file structure */
-	const META_HEADER_LEN = 28, // 22b signature + 6b meta-struct size + serialized meta-struct + data
+	private const
+		META_HEADER_LEN = 28, // 22b signature + 6b meta-struct size + serialized meta-struct + data
 	// meta structure: array of
 		META_TIME = 'time', // timestamp
 		META_SERIALIZED = 'serialized', // is content serialized?
@@ -42,7 +43,8 @@ class FileStorage implements Nette\Caching\IStorage
 		META_CALLBACKS = 'callbacks'; // array of callbacks (function, args)
 
 	/** additional cache structure */
-	const FILE = 'file',
+	private const
+		FILE = 'file',
 		HANDLE = 'handle';
 
 

src/Caching/Storages/MemoryStorage.php

@@ -30,7 +30,7 @@ class MemoryStorage implements Nette\Caching\IStorage
 	 */
 	public function read($key)
 	{
-		return isset($this->data[$key]) ? $this->data[$key] : NULL;
+		return $this->data[$key] ?? NULL;
 	}
 
 

src/Caching/Storages/NewMemcachedStorage.php

@@ -21,7 +21,8 @@ class NewMemcachedStorage implements Nette\Caching\IStorage, Nette\Caching\IBulk
 	use Nette\SmartObject;
 
 	/** @internal cache structure */
-	const META_CALLBACKS = 'callbacks',
+	private const
+		META_CALLBACKS = 'callbacks',
 		META_DATA = 'data',
 		META_DELTA = 'delta';
 

tests/Caching/Cache.php

@@ -11,7 +11,7 @@ class TestStorage implements IStorage
 
 	public function read($key)
 	{
-		return isset($this->data[$key]) ? $this->data[$key] : NULL;
+		return $this->data[$key] ?? NULL;
 	}
 
 	public function write($key, $data, array $dependencies)

tests/Storages/FileStorage.wrap.phpt

@@ -33,19 +33,19 @@ class Test
 $cache = new Cache(new FileStorage(TEMP_DIR));
 
 $called = FALSE;
-Assert::same(55, call_user_func($cache->wrap('mockFunction'), 5, 50));
+Assert::same(55, $cache->wrap('mockFunction')(5, 50));
 Assert::true($called);
 
 $called = FALSE;
-Assert::same(55, call_user_func($cache->wrap('mockFunction'), 5, 50));
+Assert::same(55, $cache->wrap('mockFunction')(5, 50));
 Assert::false($called);
 
 
 $called = FALSE;
 $callback = [new Test, 'mockMethod'];
-Assert::same(55, call_user_func($cache->wrap($callback), 5, 50));
+Assert::same(55, $cache->wrap($callback)(5, 50));
 Assert::true($called);
 
 $called = FALSE;
-Assert::same(55, call_user_func($cache->wrap($callback), 5, 50));
+Assert::same(55, $cache->wrap($callback)(5, 50));
 Assert::false($called);