21 files changed, 188 insertions, 208 deletions
diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt
index 6b520b701a..6c09c4e04d 100644
--- a/tests/classes/autoload_001.phpt
+++ b/tests/classes/autoload_001.phpt
@@ -7,17 +7,16 @@ ZE2 Autoload and class_exists
 --FILE--
 <?php
 
-function __autoload($class_name)
-{
+spl_autoload_register(function ($class_name) {
 	require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
-	echo __FUNCTION__ . '(' . $class_name . ")\n";
-}
+	echo 'autoload(' . $class_name . ")\n";
+});
 
 var_dump(class_exists('autoload_root'));
 
 ?>
 ===DONE===
 --EXPECT--
-__autoload(autoload_root)
+autoload(autoload_root)
 bool(true)
 ===DONE===
diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt
index 582cb460f4..ecb1a44512 100644
--- a/tests/classes/autoload_002.phpt
+++ b/tests/classes/autoload_002.phpt
@@ -7,18 +7,17 @@ ZE2 Autoload and get_class_methods
 --FILE--
 <?php
 
-function __autoload($class_name)
-{
+spl_autoload_register(function ($class_name) {
 	require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
-	echo __FUNCTION__ . '(' . $class_name . ")\n";
-}
+	echo 'autoload(' . $class_name . ")\n";
+});
 
 var_dump(get_class_methods('autoload_root'));
 
 ?>
 ===DONE===
 --EXPECT--
-__autoload(autoload_root)
+autoload(autoload_root)
 array(1) {
   [0]=>
   string(12) "testFunction"
diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt
index 41e877cdd9..f79b85a9f0 100644
--- a/tests/classes/autoload_003.phpt
+++ b/tests/classes/autoload_003.phpt
@@ -7,18 +7,17 @@ ZE2 Autoload and derived classes
 --FILE--
 <?php
 
-function __autoload($class_name)
-{
+spl_autoload_register(function ($class_name) {
 	require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
-	echo __FUNCTION__ . '(' . $class_name . ")\n";
-}
+	echo 'autoload(' . $class_name . ")\n";
+});
 
 var_dump(class_exists('autoload_derived'));
 
 ?>
 ===DONE===
 --EXPECT--
-__autoload(autoload_root)
-__autoload(autoload_derived)
+autoload(autoload_root)
+autoload(autoload_derived)
 bool(true)
 ===DONE===
diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt
index 88b10b50d7..1f754ca030 100644
--- a/tests/classes/autoload_004.phpt
+++ b/tests/classes/autoload_004.phpt
@@ -7,12 +7,11 @@ ZE2 Autoload and recursion
 --FILE--
 <?php
 
-function __autoload($class_name)
-{
+spl_autoload_register(function ($class_name) {
 	var_dump(class_exists($class_name));
 	require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
-	echo __FUNCTION__ . '(' . $class_name . ")\n";
-}
+	echo 'autoload(' . $class_name . ")\n";
+});
 
 var_dump(class_exists('autoload_derived'));
 
@@ -21,7 +20,7 @@ var_dump(class_exists('autoload_derived'));
 --EXPECT--
 bool(false)
 bool(false)
-__autoload(autoload_root)
-__autoload(autoload_derived)
+autoload(autoload_root)
+autoload(autoload_derived)
 bool(true)
 ===DONE===
diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt
index c5741396d5..26f4d6ae10 100644
--- a/tests/classes/autoload_005.phpt
+++ b/tests/classes/autoload_005.phpt
@@ -7,12 +7,11 @@ ZE2 Autoload from destructor
 --FILE--
 <?php
 
-function __autoload($class_name)
-{
+spl_autoload_register(function ($class_name) {
 	var_dump(class_exists($class_name, false));
 	require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
-	echo __FUNCTION__ . '(' . $class_name . ")\n";
-}
+	echo 'autoload(' . $class_name . ")\n";
+});
 
 var_dump(class_exists('autoload_derived', false));
 var_dump(class_exists('autoload_derived', false));
@@ -37,8 +36,8 @@ bool(false)
 Test::__destruct
 bool(false)
 bool(false)
-__autoload(autoload_root)
-__autoload(autoload_derived)
+autoload(autoload_root)
+autoload(autoload_derived)
 object(autoload_derived)#%d (0) {
 }
 ===DONE===
diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt
index 173b87db04..092e2e2252 100644
--- a/tests/classes/autoload_006.phpt
+++ b/tests/classes/autoload_006.phpt
@@ -7,11 +7,10 @@ ZE2 Autoload from destructor
 --FILE--
 <?php
 
-function __autoload($class_name)
-{
+spl_autoload_register(function ($class_name) {
 	require_once(dirname(__FILE__) . '/' . strtolower($class_name) . '.p5c');
-	echo __FUNCTION__ . '(' . $class_name . ")\n";
-}
+	echo 'autoload(' . $class_name . ")\n";
+});
 
 var_dump(interface_exists('autoload_interface', false));
 var_dump(class_exists('autoload_implements', false));
@@ -29,8 +28,8 @@ var_dump(class_exists('autoload_implements', false));
 --EXPECTF--
 bool(false)
 bool(false)
-__autoload(autoload_interface)
-__autoload(Autoload_Implements)
+autoload(autoload_interface)
+autoload(Autoload_Implements)
 object(autoload_implements)#%d (0) {
 }
 bool(true)
diff --git a/tests/classes/autoload_007.phpt b/tests/classes/autoload_007.phpt
index 5652c120cc..ba542a1450 100644
--- a/tests/classes/autoload_007.phpt
+++ b/tests/classes/autoload_007.phpt
@@ -2,14 +2,13 @@
 Ensure instanceof does not trigger autoload.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  $a = new stdClass;
-  var_dump($a instanceof UndefC);
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+$a = new stdClass;
+var_dump($a instanceof UndefC);
 ?>
 --EXPECTF--
 bool(false)
diff --git a/tests/classes/autoload_008.phpt b/tests/classes/autoload_008.phpt
index 75a9cd0520..1f3f075843 100644
--- a/tests/classes/autoload_008.phpt
+++ b/tests/classes/autoload_008.phpt
@@ -2,25 +2,24 @@
 Ensure catch blocks for unknown exception types do not trigger autoload.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  function f()
-  {
-      throw new Exception();
-  }
-  try {
-      f();
-  }
-  catch (UndefC $u) {
-      echo "In UndefClass catch block.\n";
-  }
-  catch (Exception $e) {
-      echo "In Exception catch block. Autoload should not have been triggered.\n";
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+function f()
+{
+  throw new Exception();
+}
+try {
+  f();
+}
+catch (UndefC $u) {
+  echo "In UndefClass catch block.\n";
+}
+catch (Exception $e) {
+  echo "In Exception catch block. Autoload should not have been triggered.\n";
+}
 ?>
 --EXPECTF--
 In Exception catch block. Autoload should not have been triggered.
diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt
index 150f3ec201..ebe691ca28 100644
--- a/tests/classes/autoload_009.phpt
+++ b/tests/classes/autoload_009.phpt
@@ -2,16 +2,15 @@
 Ensure type hints for unknown types do not trigger autoload. 
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  function f(UndefClass $x)
-  {
-  }
-  f(new stdClass);
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+function f(UndefClass $x)
+{
+}
+f(new stdClass);
 ?>
 --EXPECTF--
 Fatal error: Uncaught TypeError: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s on line %d and defined in %s:%d
diff --git a/tests/classes/autoload_010.phpt b/tests/classes/autoload_010.phpt
index 104f6888c8..e65c2565a2 100644
--- a/tests/classes/autoload_010.phpt
+++ b/tests/classes/autoload_010.phpt
@@ -2,15 +2,14 @@
 Ensure implements does trigger autoload.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  class C implements UndefI
-  {
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+class C implements UndefI
+{
+}
 ?>
 --EXPECTF--
 In autoload: string(6) "UndefI"
diff --git a/tests/classes/autoload_011.phpt b/tests/classes/autoload_011.phpt
index 86858d5f1d..aaea38c6f0 100644
--- a/tests/classes/autoload_011.phpt
+++ b/tests/classes/autoload_011.phpt
@@ -2,15 +2,14 @@
 Ensure extends does trigger autoload.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  class C extends UndefBase
-  {
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+class C extends UndefBase
+{
+}
 ?>
 --EXPECTF--
 In autoload: string(9) "UndefBase"
diff --git a/tests/classes/autoload_012.phpt b/tests/classes/autoload_012.phpt
index d6750b760d..4fc41c85f5 100644
--- a/tests/classes/autoload_012.phpt
+++ b/tests/classes/autoload_012.phpt
@@ -2,12 +2,11 @@
 Ensure callback methods in unknown classes trigger autoload.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  call_user_func("UndefC::test");
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+call_user_func("UndefC::test");
 ?>
 --EXPECTF--
 In autoload: string(6) "UndefC"
diff --git a/tests/classes/autoload_013.phpt b/tests/classes/autoload_013.phpt
index 4309cea176..a63b129562 100644
--- a/tests/classes/autoload_013.phpt
+++ b/tests/classes/autoload_013.phpt
@@ -4,18 +4,17 @@ Ensure the ReflectionClass constructor triggers autoload.
 <?php extension_loaded('reflection') or die('skip'); ?>
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  try {
-      new ReflectionClass("UndefC");
-  }
-  catch (ReflectionException $e) {
-      echo $e->getMessage();
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+try {
+  new ReflectionClass("UndefC");
+}
+catch (ReflectionException $e) {
+  echo $e->getMessage();
+}
 ?>
 --EXPECTF--
 In autoload: string(6) "UndefC"
diff --git a/tests/classes/autoload_014.phpt b/tests/classes/autoload_014.phpt
index a3f04b7b57..3eb0484ec3 100644
--- a/tests/classes/autoload_014.phpt
+++ b/tests/classes/autoload_014.phpt
@@ -4,18 +4,17 @@ Ensure the ReflectionMethod constructor triggers autoload.
 <?php extension_loaded('reflection') or die('skip'); ?>
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  try {
-      new ReflectionMethod("UndefC::test");
-  }
-  catch (ReflectionException $e) {
-      echo $e->getMessage();
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+try {
+  new ReflectionMethod("UndefC::test");
+}
+catch (ReflectionException $e) {
+  echo $e->getMessage();
+}
 ?>
 --EXPECTF--
 In autoload: string(6) "UndefC"
diff --git a/tests/classes/autoload_015.phpt b/tests/classes/autoload_015.phpt
index 2b14a0de05..edff01c91a 100644
--- a/tests/classes/autoload_015.phpt
+++ b/tests/classes/autoload_015.phpt
@@ -4,18 +4,17 @@ Ensure the ReflectionProperty constructor triggers autoload.
 <?php extension_loaded('reflection') or die('skip'); ?>
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
-  
-  try {
-      new ReflectionProperty('UndefC', 'p');
-  }
-  catch (ReflectionException $e) {
-      echo $e->getMessage();
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
+
+try {
+  new ReflectionProperty('UndefC', 'p');
+}
+catch (ReflectionException $e) {
+  echo $e->getMessage();
+}
 ?>
 --EXPECTF--
 In autoload: string(6) "UndefC"
diff --git a/tests/classes/autoload_016.phpt b/tests/classes/autoload_016.phpt
index 60263ba95a..d1ff885746 100644
--- a/tests/classes/autoload_016.phpt
+++ b/tests/classes/autoload_016.phpt
@@ -4,19 +4,18 @@ Ensure ReflectionClass::getProperty() triggers autoload
 <?php extension_loaded('reflection') or die('skip'); ?>
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
 
-  $rc = new ReflectionClass("stdClass");
-  
-  try {
-    $rc->getProperty("UndefC::p");
-  } catch (ReflectionException $e) {
-      echo $e->getMessage();
-  }
+$rc = new ReflectionClass("stdClass");
+
+try {
+$rc->getProperty("UndefC::p");
+} catch (ReflectionException $e) {
+  echo $e->getMessage();
+}
 ?>
 --EXPECTF--
 In autoload: string(6) "undefc"
diff --git a/tests/classes/autoload_017.phpt b/tests/classes/autoload_017.phpt
index d5ce2bd0e6..8e1aeac748 100644
--- a/tests/classes/autoload_017.phpt
+++ b/tests/classes/autoload_017.phpt
@@ -4,19 +4,18 @@ Ensure ReflectionClass::implementsInterface triggers autoload.
 <?php extension_loaded('reflection') or die('skip'); ?>
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "In autoload: ";
-      var_dump($name);
-  }
+spl_autoload_register(function ($name) {
+  echo "In autoload: ";
+  var_dump($name);
+});
 
-  $rc = new ReflectionClass("stdClass");
-  
-  try {
-    $rc->implementsInterface("UndefI");
-  } catch (ReflectionException $e) {
-    echo $e->getMessage();
-  }
+$rc = new ReflectionClass("stdClass");
+
+try {
+  $rc->implementsInterface("UndefI");
+} catch (ReflectionException $e) {
+  echo $e->getMessage();
+}
 ?>
 --EXPECTF--
 In autoload: string(6) "UndefI"
diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt
index 59e20e2a60..2099499e11 100644
--- a/tests/classes/autoload_018.phpt
+++ b/tests/classes/autoload_018.phpt
@@ -2,47 +2,46 @@
 Ensure __autoload() allows for recursive calls if the class name differs.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "IN:  " . __METHOD__ . "($name)\n";
-      
-      static $i = 0;
-      if ($i++ > 10) {
-          echo "-> Recursion detected - as expected.\n";
-          return;
-      }
-      
-      class_exists('UndefinedClass' . $i);
-      
-      echo "OUT: " . __METHOD__ . "($name)\n";
+spl_autoload_register(function ($name) {
+  echo "IN:  autoload($name)\n";
+  
+  static $i = 0;
+  if ($i++ > 10) {
+      echo "-> Recursion detected - as expected.\n";
+      return;
   }
   
-  var_dump(class_exists('UndefinedClass0'));
+  class_exists('UndefinedClass' . $i);
+  
+  echo "OUT: autoload($name)\n";
+});
+
+var_dump(class_exists('UndefinedClass0'));
 ?>
 --EXPECTF--
-IN:  __autoload(UndefinedClass0)
-IN:  __autoload(UndefinedClass1)
-IN:  __autoload(UndefinedClass2)
-IN:  __autoload(UndefinedClass3)
-IN:  __autoload(UndefinedClass4)
-IN:  __autoload(UndefinedClass5)
-IN:  __autoload(UndefinedClass6)
-IN:  __autoload(UndefinedClass7)
-IN:  __autoload(UndefinedClass8)
-IN:  __autoload(UndefinedClass9)
-IN:  __autoload(UndefinedClass10)
-IN:  __autoload(UndefinedClass11)
+IN:  autoload(UndefinedClass0)
+IN:  autoload(UndefinedClass1)
+IN:  autoload(UndefinedClass2)
+IN:  autoload(UndefinedClass3)
+IN:  autoload(UndefinedClass4)
+IN:  autoload(UndefinedClass5)
+IN:  autoload(UndefinedClass6)
+IN:  autoload(UndefinedClass7)
+IN:  autoload(UndefinedClass8)
+IN:  autoload(UndefinedClass9)
+IN:  autoload(UndefinedClass10)
+IN:  autoload(UndefinedClass11)
 -> Recursion detected - as expected.
-OUT: __autoload(UndefinedClass10)
-OUT: __autoload(UndefinedClass9)
-OUT: __autoload(UndefinedClass8)
-OUT: __autoload(UndefinedClass7)
-OUT: __autoload(UndefinedClass6)
-OUT: __autoload(UndefinedClass5)
-OUT: __autoload(UndefinedClass4)
-OUT: __autoload(UndefinedClass3)
-OUT: __autoload(UndefinedClass2)
-OUT: __autoload(UndefinedClass1)
-OUT: __autoload(UndefinedClass0)
+OUT: autoload(UndefinedClass10)
+OUT: autoload(UndefinedClass9)
+OUT: autoload(UndefinedClass8)
+OUT: autoload(UndefinedClass7)
+OUT: autoload(UndefinedClass6)
+OUT: autoload(UndefinedClass5)
+OUT: autoload(UndefinedClass4)
+OUT: autoload(UndefinedClass3)
+OUT: autoload(UndefinedClass2)
+OUT: autoload(UndefinedClass1)
+OUT: autoload(UndefinedClass0)
 bool(false)
 
diff --git a/tests/classes/autoload_019.phpt b/tests/classes/autoload_019.phpt
index 783632013b..b9bcd6e6d1 100644
--- a/tests/classes/autoload_019.phpt
+++ b/tests/classes/autoload_019.phpt
@@ -2,13 +2,12 @@
 Ensure __autoload() recursion is guarded for multiple lookups of same class using difference case.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo __FUNCTION__ . " $name\n";
-      class_exists("undefinedCLASS");
-  }
-  
-  class_exists("unDefinedClass");
+spl_autoload_register(function ($name) {
+  echo "autoload $name\n";
+  class_exists("undefinedCLASS");
+});
+
+class_exists("unDefinedClass");
 ?>
 --EXPECTF--
-__autoload unDefinedClass
+autoload unDefinedClass
diff --git a/tests/classes/autoload_020.phpt b/tests/classes/autoload_020.phpt
index a88e561238..7cecff07cb 100644
--- a/tests/classes/autoload_020.phpt
+++ b/tests/classes/autoload_020.phpt
@@ -2,12 +2,11 @@
 Ensure __autoload() is triggered during unserialization.
 --FILE--
 <?php
-  function __autoload($name)
-  {
-      echo "in autoload: $name\n";
-  }
-  
-  var_dump(unserialize('O:1:"C":0:{}'));
+spl_autoload_register(function ($name) {
+  echo "in autoload: $name\n";
+});
+
+var_dump(unserialize('O:1:"C":0:{}'));
 ?>
 --EXPECTF--
 in autoload: C
diff --git a/tests/classes/autoload_021.phpt b/tests/classes/autoload_021.phpt
index 3237627380..f3dd8ff26d 100644
--- a/tests/classes/autoload_021.phpt
+++ b/tests/classes/autoload_021.phpt
@@ -2,9 +2,9 @@
 Validation of class names in the autoload process
 --FILE--
 <?php
-function __autoload($name) {
+spl_autoload_register(function ($name) {
 	echo "$name\n";
-}
+});
 $a = "../BUG";
 $x = new $a;
 echo "BUG\n";