Callback::closure() uses native Closure::fromCallable in PHP 7.1 (BC break)

BC break: is unable to create closure for private/protected methods from a different scope

Author: dg

src/Utils/Callback.php

@@ -27,7 +27,14 @@ public static function closure($callable, string $method = NULL): \Closure
 	{
 		if ($method !== NULL) {
 			$callable = [$callable, $method];
+		}
 
+		if (PHP_VERSION_ID >= 70100) {
+			try {
+				return \Closure::fromCallable($callable);
+			} catch (\TypeError $e) {
+				throw new Nette\InvalidArgumentException($e->getMessage());
+			}
 		} elseif (is_string($callable) && count($tmp = explode('::', $callable)) === 2) {
 			$callable = $tmp;
 

tests/Utils/Callback.closure.phpt

@@ -86,7 +86,7 @@ test(function () { // global function
 
 	Assert::exception(function () {
 		Callback::closure('undefined');
-	}, Nette\InvalidArgumentException::class, "Callback 'undefined' is not callable.");
+	}, Nette\InvalidArgumentException::class, PHP_VERSION_ID >= 70100 ? "%a% function 'undefined' not found %a%" : "Callback 'undefined' is not callable.");
 
 	Assert::exception(function () {
 		Callback::toReflection('undefined');
@@ -142,7 +142,7 @@ test(function () { // object methods
 	Assert::same('Test::privateFun', getName(Callback::toReflection([$test, 'privateFun'])));
 	Assert::same('Test::privateFun', getName(Callback::toReflection(Callback::closure($test, 'privateFun'))));
 
-	Assert::same('Test::privateFun*', Callback::closure($test, 'privateFun')->__invoke('*'));
+	Assert::same(PHP_VERSION_ID >= 70100 ? 'Test::__call privateFun *' : 'Test::privateFun*', Callback::closure($test, 'privateFun')->__invoke('*'));
 
 	Assert::same('Test::ref', Callback::closure($test, 'ref')(...[&$res]));
 	Assert::same('Test::ref', $res);
@@ -175,7 +175,7 @@ test(function () { // static methods
 	Assert::same('Test::privateStatic', getName(Callback::toReflection('Test::privateStatic')));
 	Assert::same('Test::privateStatic', getName(Callback::toReflection(Callback::closure('Test::privateStatic'))));
 
-	Assert::same('Test::privateStatic*', Callback::closure('Test::privateStatic')->__invoke('*'));
+	Assert::same(PHP_VERSION_ID >= 70100 ? 'Test::__callStatic privateStatic *' : 'Test::privateStatic*', Callback::closure('Test::privateStatic')->__invoke('*'));
 });