15 files changed, 72 insertions, 34 deletions
diff --git a/ext/opcache/tests/bug68252.phpt b/ext/opcache/tests/bug68252.phpt
index e05467a244..bc2e5a0fb6 100644
--- a/ext/opcache/tests/bug68252.phpt
+++ b/ext/opcache/tests/bug68252.phpt
@@ -16,5 +16,6 @@ function a() {
 create_function('', 'var_dump("22");');
 
 a();
---EXPECT--
+--EXPECTF--
+Deprecated: Function create_function() is deprecated in %s on line %d
 okey
diff --git a/ext/pcre/tests/preg_replace_callback2.phpt b/ext/pcre/tests/preg_replace_callback2.phpt
index 7989509aa1..1fe78d59ee 100644
--- a/ext/pcre/tests/preg_replace_callback2.phpt
+++ b/ext/pcre/tests/preg_replace_callback2.phpt
@@ -19,7 +19,7 @@ var_dump(preg_replace_callback('@\b\w{1,2}\b@', 'g', array('a b3 bcd', 'v' => 'a
 
 var_dump(preg_replace_callback('~\A.~', 'g', array(array('xyz'))));
 
-var_dump(preg_replace_callback('~\A.~', create_function('$m', 'return strtolower($m[0]);'), 'ABC'));
+var_dump(preg_replace_callback('~\A.~', function($m) { return strtolower($m[0]); }, 'ABC'));
 ?>
 --EXPECTF--
 array(3) {
diff --git a/ext/pcre/tests/preg_replace_callback_array.phpt b/ext/pcre/tests/preg_replace_callback_array.phpt
index 9e9e819134..6780bfba1b 100644
--- a/ext/pcre/tests/preg_replace_callback_array.phpt
+++ b/ext/pcre/tests/preg_replace_callback_array.phpt
@@ -38,7 +38,7 @@ var_dump(preg_replace_callback_array(
 		'/d/' => array("Foo", "rep"),
 		"/c/" => new Rep,
 		"/a/" => 'b',
-		"/b/" => create_function('$a', 'return "ok";')), 'a', -1, $count));
+		"/b/" => function($a) { return "ok"; }), 'a', -1, $count));
 
 var_dump($count);
 ?>
diff --git a/ext/spl/tests/bug61697.phpt b/ext/spl/tests/bug61697.phpt
index 064aaa2e2b..8cd38289ef 100644
--- a/ext/spl/tests/bug61697.phpt
+++ b/ext/spl/tests/bug61697.phpt
@@ -8,8 +8,8 @@ function f2($class) { echo "f2: [[$class]]\n"; }
 
 spl_autoload_register('f1');
 spl_autoload_register('f2');
-spl_autoload_register(create_function('$class', 'echo "cf1: [[$class]]\n";'));
-spl_autoload_register(create_function('$class', 'echo "cf2: [[$class]]\n";'));
+spl_autoload_register(function($class) { echo "cf1: [[$class]]\n"; });
+spl_autoload_register(function($class) { echo "cf2: [[$class]]\n"; });
 
 foreach (spl_autoload_functions() AS $func)
 {
diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt
index cb856f713d..79fb574e23 100644
--- a/ext/standard/tests/array/array_filter_variation7.phpt
+++ b/ext/standard/tests/array/array_filter_variation7.phpt
@@ -17,19 +17,19 @@ $input = array(0, 1, -1, 10, 100, 1000, 'Hello', null);
 
 // anonymous callback function
 echo "Anonymous callback function with regular parameter and statement\n";
-var_dump( array_filter($input, create_function('$input', 'return ($input > 1);') ) );
+var_dump( array_filter($input, function($input) { return ($input > 1); }) );
 
 // anonymous callback function with reference
 echo "Anonymous callback function with reference parameter\n";
-var_dump( array_filter($input, create_function('&$input', 'return ($input < 1);') ) );
+var_dump( array_filter($input, function(&$input) { return ($input < 1); }) );
 
 // anonymous callback function with null argument
 echo "Anonymous callback funciton with null argument\n";
-var_dump( array_filter($input, create_function(null, 'return true;') ) );
+var_dump( array_filter($input, function() { return true; }) );
 
 // anonymous callback function with argument and null statement
 echo "Anonymous callback function with regular argument and null statement\n";
-var_dump( array_filter($input, create_function('$input', null) ) );
+var_dump( array_filter($input, function($input) { }) );
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt
index ecf9157620..effda06745 100644
--- a/ext/standard/tests/array/array_map_variation10.phpt
+++ b/ext/standard/tests/array/array_map_variation10.phpt
@@ -17,23 +17,23 @@ $array1 = array(1, 2, 3);
 $array2 = array(3, 4, 5);
 
 echo "-- anonymous function with all parameters and body --\n";
-var_dump( array_map( create_function('$a, $b', 'return array($a, $b);'), $array1, $array2));
+var_dump( array_map( function($a, $b) { return array($a, $b); }, $array1, $array2));
 
 echo "-- anonymous function with two parameters and passing one array --\n";
 try {
-	var_dump( array_map( create_function('$a, $b', 'return array($a, $b);'), $array1));
+	var_dump( array_map( function($a, $b) { return array($a, $b); }, $array1));
 } catch (Throwable $e) {
 	echo "Exception: " . $e->getMessage() . "\n";
 }
 
 echo "-- anonymous function with NULL parameter --\n";
-var_dump( array_map( create_function(NULL, 'return NULL;'), $array1));
+var_dump( array_map( function() { return NULL; }, $array1));
 
 echo "-- anonymous function with NULL body --\n";
-var_dump( array_map( create_function('$a', NULL), $array1));
+var_dump( array_map( function($a) { }, $array1));
 
 echo "-- passing NULL as 'arr1' --\n";
-var_dump( array_map( create_function('$a', 'return array($a);'), NULL));
+var_dump( array_map( function($a) { return array($a); }, NULL));
 
 echo "Done";
 ?>
@@ -64,7 +64,7 @@ array(3) {
   }
 }
 -- anonymous function with two parameters and passing one array --
-Exception: Too few arguments to function __lambda_func(), 1 passed and exactly 2 expected
+Exception: Too few arguments to function {closure}(), 1 passed and exactly 2 expected
 -- anonymous function with NULL parameter --
 array(3) {
   [0]=>
diff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
index 0cdd6d248d..bc0d205900 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
@@ -21,19 +21,19 @@ echo "*** Testing array_walk_recursive() : anonymous function as callback ***\n"
 $input = array( array(2, 5), array(10, 0));
 
 echo "-- Anonymous function with one argument --\n";
-var_dump( array_walk_recursive($input, create_function('$value', 'var_dump($value); echo "\n";')));
+var_dump( array_walk_recursive($input, function($value) { var_dump($value); echo "\n"; }));
 
 echo "-- Anonymous function with two arguments --\n";
-var_dump( array_walk_recursive($input, create_function('$value, $key', 'var_dump($key); var_dump($value); echo "\n";')));
+var_dump( array_walk_recursive($input, function($value, $key) { var_dump($key); var_dump($value); echo "\n"; }));
 
 echo "-- Anonymous function with three arguments --\n";
-var_dump( array_walk_recursive($input, create_function('$value, $key, $user_data', 'var_dump($key); var_dump($value); var_dump($user_data); echo "\n";'), 10));
+var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10));
 
 echo "-- Anonymous function with one more argument --\n";
-var_dump( array_walk_recursive($input, create_function('$value, $key, $user_data', 'var_dump($key); var_dump($value); var_dump($user_data); echo "\n";'), 20, 30)); 
+var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); 
 
 echo "-- Anonymous function with null argument --\n";
-var_dump( array_walk_recursive( $input, create_function(null, 'echo "1\n";')));
+var_dump( array_walk_recursive( $input, function() { echo "1\n"; }));
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt
index da85958b8e..692f276628 100644
--- a/ext/standard/tests/array/array_walk_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_variation7.phpt
@@ -21,19 +21,19 @@ echo "*** Testing array_walk() : anonymous function as callback ***\n";
 $input = array(2, 5, 10, 0);
 
 echo "-- Anonymous function with one argument --\n";
-var_dump( array_walk($input, create_function('$value', 'var_dump($value); echo "\n";')));
+var_dump( array_walk($input, function($value) { var_dump($value); echo "\n"; }));
 
 echo "-- Anonymous function with two arguments --\n";
-var_dump( array_walk($input, create_function('$value, $key', 'var_dump($key); var_dump($value); echo "\n";')));
+var_dump( array_walk($input, function($value, $key) { var_dump($key); var_dump($value); echo "\n"; }));
 
 echo "-- Anonymous function with three arguments --\n";
-var_dump( array_walk($input, create_function('$value, $key, $user_data', 'var_dump($key); var_dump($value); var_dump($user_data); echo "\n";'), 10));
+var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10));
 
 echo "-- Anonymous function with one more argument --\n";
-var_dump( array_walk($input, create_function('$value, $key, $user_data', 'var_dump($key); var_dump($value); var_dump($user_data); echo "\n";'), 20, 30)); 
+var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); 
 
 echo "-- Anonymous function with null argument --\n";
-var_dump( array_walk( $input, create_function(null, 'echo "1\n";')));
+var_dump( array_walk( $input, function() { echo "1\n"; }));
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/uasort_variation7.phpt
index 44a2bb3a26..e37d9efe6b 100644
--- a/ext/standard/tests/array/uasort_variation7.phpt
+++ b/ext/standard/tests/array/uasort_variation7.phpt
@@ -15,16 +15,26 @@ Test uasort() function : usage variations - anonymous function as 'cmp_function'
 
 echo "*** Testing uasort() : anonymous function as 'cmp_function' ***\n";
 
-$cmp_function = 'if($value1 == $value2) {return 0;} else if($value1 > $value2) {return 1;} else{return -1;}';
+$cmp_function = function($value1, $value2) {
+    if ($value1 == $value2) { return 0; }
+    else if ($value1 > $value2) { return 1; }
+    else { return -1; }
+};
 
 $array_arg = array(0 => 100, 1 => 3, 2 => -70, 3 => 24, 4 => 90);
 echo "-- Anonymous 'cmp_function' with parameters passed by value --\n";
-var_dump( uasort($array_arg, create_function('$value1, $value2',$cmp_function) ) );
+var_dump( uasort($array_arg, $cmp_function) );
 var_dump($array_arg);
 
+$cmp_function = function(&$value1, &$value2) {
+    if ($value1 == $value2) { return 0; }
+    else if ($value1 > $value2) { return 1; }
+    else { return -1; }
+};
+
 $array_arg = array("b" => "Banana", "m" => "Mango", "a" => "Apple", "p" => "Pineapple");
 echo "-- Anonymous 'cmp_function' with parameters passed by reference --\n";
-var_dump( uasort($array_arg, create_function('&$value1, &$value2', $cmp_function) ) );
+var_dump( uasort($array_arg, $cmp_function ) );
 var_dump($array_arg);
 
 echo "Done"
diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/usort_variation7.phpt
index e567341b1a..171e751df2 100644
--- a/ext/standard/tests/array/usort_variation7.phpt
+++ b/ext/standard/tests/array/usort_variation7.phpt
@@ -13,18 +13,28 @@ Test usort() function : usage variations - Anonymous comparison function
 
 echo "*** Testing usort() : usage variation ***\n";
 
-$cmp_function = 'if($value1 == $value2) {return 0;} else if($value1 > $value2) {return 1;} else{return -1;}';
+$cmp_function = function($value1, $value2) {
+    if ($value1 == $value2) { return 0; }
+    else if ($value1 > $value2) { return 1; }
+    else { return -1; }
+};
 
 $array_arg = array(0 => 100, 1 => 3, 2 => -70, 3 => 24, 4 => 90);
 
 echo "\n-- Anonymous 'cmp_function' with parameters passed by value --\n";
-var_dump( usort($array_arg, create_function('$value1, $value2',$cmp_function) ) );
+var_dump( usort($array_arg, $cmp_function) );
 var_dump($array_arg);
 
 $array_arg = array("b" => "Banana", "m" => "Mango", "a" => "Apple", "p" => "Pineapple");
 
+$cmp_function = function(&$value1, &$value2) {
+    if ($value1 == $value2) { return 0; }
+    else if ($value1 > $value2) { return 1; }
+    else { return -1; }
+};
+
 echo "\n-- Anonymous 'cmp_function' with parameters passed by reference --\n";
-var_dump( usort($array_arg, create_function('&$value1, &$value2', $cmp_function) ) );
+var_dump( usort($array_arg, $cmp_function) );
 var_dump($array_arg);
 ?>
 ===DONE===
@@ -58,4 +68,4 @@ array(4) {
   [3]=>
   string(9) "Pineapple"
 }
-===DONE===
-\ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt
index e5b630a839..e502f61291 100644
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -1720,8 +1720,12 @@ Array
 
 
 *** Testing print_r() on anonymous functions ***
+
+Deprecated: Function create_function() is deprecated in %s on line %d
 New anonymous function: 
-2 * 3 = 6
+2 * 3 = 6
+Deprecated: Function create_function() is deprecated in %s on line %d
+
 
 *** Testing error conditions ***
 
diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt
index 40f44ea1e4..3054e0a431 100644
--- a/ext/standard/tests/general_functions/print_r_64bit.phpt
+++ b/ext/standard/tests/general_functions/print_r_64bit.phpt
@@ -1721,8 +1721,12 @@ Array
 
 
 *** Testing print_r() on anonymous functions ***
+
+Deprecated: Function create_function() is deprecated in %s on line %d
 New anonymous function: 
-2 * 3 = 6
+2 * 3 = 6
+Deprecated: Function create_function() is deprecated in %s on line %d
+
 
 *** Testing error conditions ***
 
diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt
index 9821e95eaa..78c862b77d 100644
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -1563,8 +1563,12 @@ array(6) {
 }
 
 *** Testing var_dump() on anonymous functions ***
+
+Deprecated: Function create_function() is deprecated in %s on line %d
 New anonymous function: 
 string(9) "2 * 3 = 6"
+
+Deprecated: Function create_function() is deprecated in %s on line %d
 string(9) "
 
 *** Testing error conditions ***
diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt
index 6bbbb3f51d..3b8212204a 100644
--- a/ext/standard/tests/general_functions/var_dump_64bit.phpt
+++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt
@@ -1563,8 +1563,12 @@ array(6) {
 }
 
 *** Testing var_dump() on anonymous functions ***
+
+Deprecated: Function create_function() is deprecated in %s on line %d
 New anonymous function: 
 string(9) "2 * 3 = 6"
+
+Deprecated: Function create_function() is deprecated in %s on line %d
 string(9) "
 
 *** Testing error conditions ***
diff --git a/ext/standard/tests/strings/bug37262.phpt b/ext/standard/tests/strings/bug37262.phpt
index 5a9f7f724d..ffdc994f46 100644
--- a/ext/standard/tests/strings/bug37262.phpt
+++ b/ext/standard/tests/strings/bug37262.phpt
@@ -6,4 +6,5 @@ $func = create_function('$a', 'return $a;');
 var_export($func);
 ?>
 --EXPECTF--	
+Deprecated: Function create_function() is deprecated in %s on line %d
 '' . "\0" . 'lambda_%d'