Deprecate __autoload()

20 files changed, 144 insertions, 148 deletions

diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt
index 4cb6cbd327..208a895e6b 100644
--- a/ext/standard/tests/class_object/class_exists_basic_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt
@@ -10,9 +10,9 @@ Test class_exists() function : basic functionality
 
 echo "*** Testing class_exists() : basic functionality ***\n";
 
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 echo "Calling class_exists() on non-existent class with autoload explicitly enabled:\n";
 var_dump( class_exists('C', true) );
@@ -34,7 +34,7 @@ echo "Done";
 --EXPECTF--
 *** Testing class_exists() : basic functionality ***
 Calling class_exists() on non-existent class with autoload explicitly enabled:
-In __autoload(C)
+In autoload(C)
 bool(false)
 
 Calling class_exists() on existing class with autoload explicitly enabled:
@@ -47,9 +47,9 @@ Calling class_exists() on existing class with autoload explicitly disabled:
 bool(true)
 
 Calling class_exists() on non-existent class with autoload unspecified:
-In __autoload(E)
+In autoload(E)
 bool(false)
 
 Calling class_exists() on existing class with autoload unspecified:
 bool(true)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt
index 5f51b4bd93..b847c0285c 100644
--- a/ext/standard/tests/class_object/class_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt
@@ -8,9 +8,9 @@ Test class_exists() function : usage variations - unexpected types for argument
  * Alias to functions: 
  */
 
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -88,15 +88,15 @@ Error: 8 - Undefined variable: undefined_var, %s(67)
 Error: 8 - Undefined variable: unset_var, %s(70)
 
 Arg value 0 
-In __autoload(0)
+In autoload(0)
 bool(false)
 
 Arg value 1 
-In __autoload(1)
+In autoload(1)
 bool(false)
 
 Arg value 12345 
-In __autoload(12345)
+In autoload(12345)
 bool(false)
 
 Arg value -2345 
@@ -109,7 +109,7 @@ Arg value -10.5
 bool(false)
 
 Arg value 101234567000 
-In __autoload(101234567000)
+In autoload(101234567000)
 bool(false)
 
 Arg value 1.07654321E-9 
@@ -150,14 +150,14 @@ Arg value
 bool(false)
 
 Arg value 1 
-In __autoload(1)
+In autoload(1)
 bool(false)
 
 Arg value  
 bool(false)
 
 Arg value 1 
-In __autoload(1)
+In autoload(1)
 bool(false)
 
 Arg value  
@@ -179,4 +179,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt
index 954e4d8cbc..ee6832cf3e 100644
--- a/ext/standard/tests/class_object/class_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt
@@ -8,9 +8,9 @@ Test class_exists() function : usage variations  - unexpected types for argument
  * Alias to functions: 
  */
 
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -95,35 +95,35 @@ Arg value 0
 bool(false)
 
 Arg value 1 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 12345 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value -2345 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 10.5 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value -10.5 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 101234567000 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 1.07654321E-9 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 0.5 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d)
 
@@ -158,14 +158,14 @@ Arg value
 bool(false)
 
 Arg value 1 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value  
 bool(false)
 
 Arg value 1 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value  
@@ -178,11 +178,11 @@ Arg value
 bool(false)
 
 Arg value string 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value string 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(80)
 
@@ -195,4 +195,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt
index 259f5dc0f8..3853bb6229 100644
--- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt
+++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt
@@ -11,9 +11,9 @@ Test get_declared_classes() function : testing autoloaded classes
 
 echo "*** Testing get_declared_classes() : testing autoloaded classes ***\n";
 
-function __autoload($class_name) {
+spl_autoload_register(function ($class_name) {
     require_once $class_name . '.inc';
-}
+});
 
 echo "\n-- before instance is declared --\n";
 var_dump(in_array('AutoLoaded', get_declared_classes()));
diff --git a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt
index 56e6161b23..12c92df7fa 100644
--- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt
+++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt
@@ -11,9 +11,9 @@ Test get_declared_interfaces() function : autoloading of interfaces
 
 echo "*** Testing get_declared_interfaces() : autoloading of interfaces ***\n";
 
-function __autoload($class_name) {
+spl_autoload_register(function ($class_name) {
     require_once $class_name . '.inc';
-}
+});
 
 echo "\n-- before interface is used --\n";
 var_dump(in_array('AutoInterface', get_declared_interfaces()));
diff --git a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt
index bedd37a3db..6ea3edfa79 100644
--- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt
+++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt
@@ -11,9 +11,9 @@ Test get_declared_traits() function : testing autoloaded traits
 
 echo "*** Testing get_declared_traits() : testing autoloaded traits ***\n";
 
-function __autoload($trait_name) {
+spl_autoload_register(function ($trait_name) {
     require_once $trait_name . '.inc';
-}
+});
 
 echo "\n-- before instance is declared --\n";
 var_dump(in_array('AutoTrait', get_declared_traits()));
diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
index 0d19e22364..97f848168d 100644
--- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
+++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
@@ -8,9 +8,9 @@ Test get_parent_class() function : usage variations  - unexpected argument type.
  * Alias to functions: 
  */
 
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -160,11 +160,11 @@ Arg value
 bool(false)
 
 Arg value string 
-In __autoload(string)
+In autoload(string)
 bool(false)
 
 Arg value String 
-In __autoload(String)
+In autoload(String)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(77)
 
@@ -176,4 +176,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/interface_exists_variation3.phpt b/ext/standard/tests/class_object/interface_exists_variation3.phpt
index d25d74bc41..5119945bac 100644
--- a/ext/standard/tests/class_object/interface_exists_variation3.phpt
+++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt
@@ -10,9 +10,9 @@ Test interface_exists() function : autoloaded interface
 
 echo "*** Testing interface_exists() : autoloaded interface ***\n";
 
-function __autoload($class_name) {
+spl_autoload_register(function ($class_name) {
     require_once $class_name . '.inc';
-}
+});
 
 echo "\n-- no autoloading --\n";
 var_dump(interface_exists("AutoInterface", false));
@@ -32,4 +32,4 @@ bool(false)
 -- with autoloading --
 bool(true)
 
-DONE
\ No newline at end of file
+DONE
diff --git a/ext/standard/tests/class_object/interface_exists_variation4.phpt b/ext/standard/tests/class_object/interface_exists_variation4.phpt
index c059805623..ca787396f7 100644
--- a/ext/standard/tests/class_object/interface_exists_variation4.phpt
+++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt
@@ -10,10 +10,9 @@ Test interface_exists() function : test autoload default value
 
 echo "*** Testing interface_exists() : test autoload default value ***\n";
 
-function __autoload($class_name) {
+spl_autoload_register(function ($class_name) {
     require_once $class_name . '.inc';
-}
-
+});
 
 var_dump(interface_exists("AutoInterface"));
 
@@ -24,4 +23,4 @@ echo "\nDONE\n";
 *** Testing interface_exists() : test autoload default value ***
 bool(true)
 
-DONE
\ No newline at end of file
+DONE
diff --git a/ext/standard/tests/class_object/is_a.phpt b/ext/standard/tests/class_object/is_a.phpt
index db74cdcc9a..99794cafb2 100644
--- a/ext/standard/tests/class_object/is_a.phpt
+++ b/ext/standard/tests/class_object/is_a.phpt
@@ -60,13 +60,10 @@ $t->test();
 $t = new derived_a();
 $t->test();
 
-eval('
-  function __autoload($name)
-  {
-      echo ">>>> In __autoload: ";
-      var_dump($name);
-  }
-');
+spl_autoload_register(function ($name) {
+    echo ">>>> In autoload: ";
+    var_dump($name);
+});
 
 echo "NOW WITH AUTOLOAD\n\n";
 
@@ -201,11 +198,11 @@ is_subclass_of( OBJECT:base, base) =                        no
 is_subclass_of( STRING:base, base) =                        no
 is_subclass_of( STRING:base, base,false) =                  no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, base,true) =                           no
 is_a( STRING:undefB, base) =                                no
 is_subclass_of( STRING:undefB, base,false) =                no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, base) =                      no
 
 >>> With Defined class
@@ -216,11 +213,11 @@ is_subclass_of( OBJECT:base, derived_a) =                   no
 is_subclass_of( STRING:base, derived_a) =                   no
 is_subclass_of( STRING:base, derived_a,false) =             no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, derived_a,true) =                      no
 is_a( STRING:undefB, derived_a) =                           no
 is_subclass_of( STRING:undefB, derived_a,false) =           no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, derived_a) =                 no
 
 >>> With Defined class
@@ -231,11 +228,11 @@ is_subclass_of( OBJECT:base, if_a) =                        no
 is_subclass_of( STRING:base, if_a) =                        no
 is_subclass_of( STRING:base, if_a,false) =                  no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, if_a,true) =                           no
 is_a( STRING:undefB, if_a) =                                no
 is_subclass_of( STRING:undefB, if_a,false) =                no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, if_a) =                      no
 
 >>> With Defined class
@@ -246,11 +243,11 @@ is_subclass_of( OBJECT:base, undefA) =                      no
 is_subclass_of( STRING:base, undefA) =                      no
 is_subclass_of( STRING:base, undefA,false) =                no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, undefA,true) =                         no
 is_a( STRING:undefB, undefA) =                              no
 is_subclass_of( STRING:undefB, undefA,false) =              no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, undefA) =                    no
 
 
@@ -262,11 +259,11 @@ is_subclass_of( OBJECT:derived_a, base) =                   yes
 is_subclass_of( STRING:derived_a, base) =                   yes
 is_subclass_of( STRING:derived_a, base,false) =             no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, base,true) =                           no
 is_a( STRING:undefB, base) =                                no
 is_subclass_of( STRING:undefB, base,false) =                no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, base) =                      no
 
 >>> With Defined class
@@ -277,11 +274,11 @@ is_subclass_of( OBJECT:derived_a, derived_a) =              no
 is_subclass_of( STRING:derived_a, derived_a) =              no
 is_subclass_of( STRING:derived_a, derived_a,false) =        no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, derived_a,true) =                      no
 is_a( STRING:undefB, derived_a) =                           no
 is_subclass_of( STRING:undefB, derived_a,false) =           no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, derived_a) =                 no
 
 >>> With Defined class
@@ -292,11 +289,11 @@ is_subclass_of( OBJECT:derived_a, if_a) =                   yes
 is_subclass_of( STRING:derived_a, if_a) =                   yes
 is_subclass_of( STRING:derived_a, if_a,false) =             no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, if_a,true) =                           no
 is_a( STRING:undefB, if_a) =                                no
 is_subclass_of( STRING:undefB, if_a,false) =                no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, if_a) =                      no
 
 >>> With Defined class
@@ -307,11 +304,11 @@ is_subclass_of( OBJECT:derived_a, undefA) =                 no
 is_subclass_of( STRING:derived_a, undefA) =                 no
 is_subclass_of( STRING:derived_a, undefA,false) =           no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, undefA,true) =                         no
 is_a( STRING:undefB, undefA) =                              no
 is_subclass_of( STRING:undefB, undefA,false) =              no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, undefA) =                    no
 
 
@@ -323,11 +320,11 @@ is_subclass_of( OBJECT:derived_b, base) =                   yes
 is_subclass_of( STRING:derived_b, base) =                   yes
 is_subclass_of( STRING:derived_b, base,false) =             no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, base,true) =                           no
 is_a( STRING:undefB, base) =                                no
 is_subclass_of( STRING:undefB, base,false) =                no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, base) =                      no
 
 >>> With Defined class
@@ -338,11 +335,11 @@ is_subclass_of( OBJECT:derived_b, derived_a) =              no
 is_subclass_of( STRING:derived_b, derived_a) =              no
 is_subclass_of( STRING:derived_b, derived_a,false) =        no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, derived_a,true) =                      no
 is_a( STRING:undefB, derived_a) =                           no
 is_subclass_of( STRING:undefB, derived_a,false) =           no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, derived_a) =                 no
 
 >>> With Defined class
@@ -353,11 +350,11 @@ is_subclass_of( OBJECT:derived_b, if_a) =                   yes
 is_subclass_of( STRING:derived_b, if_a) =                   yes
 is_subclass_of( STRING:derived_b, if_a,false) =             no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, if_a,true) =                           no
 is_a( STRING:undefB, if_a) =                                no
 is_subclass_of( STRING:undefB, if_a,false) =                no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, if_a) =                      no
 
 >>> With Defined class
@@ -368,9 +365,9 @@ is_subclass_of( OBJECT:derived_b, undefA) =                 no
 is_subclass_of( STRING:derived_b, undefA) =                 no
 is_subclass_of( STRING:derived_b, undefA,false) =           no
 >>> With Undefined
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_a( STRING:undefB, undefA,true) =                         no
 is_a( STRING:undefB, undefA) =                              no
 is_subclass_of( STRING:undefB, undefA,false) =              no
->>>> In __autoload: string(6) "undefB"
+>>>> In autoload: string(6) "undefB"
 is_subclass_of( STRING:undefB, undefA) =                    no
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
index 201d8789ea..b1cb553abd 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
@@ -8,9 +8,9 @@ Test is_subclass_of() function : usage variations  - unexpected type for arg 1
  * Alias to functions: 
  */
 // Note: basic use cases in Zend/tests/is_a.phpt
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -161,11 +161,11 @@ Arg value
 bool(false)
 
 Arg value string 
-In __autoload(string)
+In autoload(string)
 bool(false)
 
 Arg value String 
-In __autoload(String)
+In autoload(String)
 bool(false)
 
 Arg value  
@@ -173,4 +173,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
index 9bb712b757..85f697654d 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
@@ -8,9 +8,9 @@ Test is_subclass_of() function : usage variations  - unexpected type for arg 2
  * Alias to functions: 
  */
 
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -173,4 +173,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
index 65ae8a4e23..adecd5003d 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
@@ -8,9 +8,9 @@ Test is_subclass_of() function : usage variations  - unexpected type for arg 1 w
  * Alias to functions: 
  */
 // Note: basic use cases in Zend/tests/is_a.phpt
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -161,11 +161,11 @@ Arg value
 bool(false)
 
 Arg value string 
-In __autoload(string)
+In autoload(string)
 bool(false)
 
 Arg value String 
-In __autoload(String)
+In autoload(String)
 bool(false)
 
 Arg value  
@@ -173,4 +173,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt
index 32f62b7e4b..3ac1795149 100644
--- a/ext/standard/tests/class_object/method_exists_basic_003.phpt
+++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt
@@ -8,15 +8,15 @@ method_exists() on non-existent class, with __autoload().
  * Alias to functions: 
  */
 
-function __autoload($name) {
-	echo "In __autoload($name)\n"; 
-} 
+spl_autoload_register(function ($name) {
+	echo "In autoload($name)\n"; 
+});
 
 var_dump(method_exists('UndefC', 'func'));
 
 echo "Done";
 ?>
 --EXPECTF--
-In __autoload(UndefC)
+In autoload(UndefC)
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt
index 1947c76ac5..b41a1a11ae 100644
--- a/ext/standard/tests/class_object/method_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt
@@ -8,9 +8,9 @@ Test method_exists() function : usage variations  - unexpected type for arg 1
  * Alias to functions: 
  */
 
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -160,11 +160,11 @@ Arg value
 bool(false)
 
 Arg value string 
-In __autoload(string)
+In autoload(string)
 bool(false)
 
 Arg value String 
-In __autoload(String)
+In autoload(String)
 bool(false)
 
 Arg value  
@@ -172,4 +172,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt
index b1204e833d..5c924bdc5a 100644
--- a/ext/standard/tests/class_object/method_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt
@@ -8,9 +8,9 @@ Test method_exists() function : usage variations  - unexpected type for arg 2
  * Alias to functions: 
  */
 
-function __autoload($className) {
-	echo "In __autoload($className)\n";
-}
+spl_autoload_register(function ($className) {
+	echo "In autoload($className)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -173,4 +173,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt
index 1505a4bafa..1830440621 100644
--- a/ext/standard/tests/class_object/property_exists_variation1.phpt
+++ b/ext/standard/tests/class_object/property_exists_variation1.phpt
@@ -10,9 +10,9 @@ Test property_exists() function : class auto loading
 
 echo "*** Testing property_exists() : class auto loading ***\n";
 
-function __autoload($class_name) {
+spl_autoload_register(function ($class_name) {
     require_once $class_name . '.inc';
-}
+});
 
 echo "\ntesting property in autoloaded class\n";
 var_dump(property_exists("AutoTest", "bob"));
@@ -30,4 +30,4 @@ bool(true)
 
 testing __get magic method
 bool(false)
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/class_object/trait_exists_basic_001.phpt b/ext/standard/tests/class_object/trait_exists_basic_001.phpt
index 19616ab5c5..6e1d45227d 100644
--- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt
@@ -10,9 +10,9 @@ Test trait_exists() function : basic functionality
 
 echo "*** Testing trait_exists() : basic functionality ***\n";
 
-function __autoload($traitName) {
-	echo "In __autoload($traitName)\n";
-}
+spl_autoload_register(function ($traitName) {
+	echo "In autoload($traitName)\n";
+});
 
 trait MyTrait {}
 
@@ -36,7 +36,7 @@ echo "Done";
 --EXPECTF--
 *** Testing trait_exists() : basic functionality ***
 Calling trait_exists() on non-existent trait with autoload explicitly enabled:
-In __autoload(C)
+In autoload(C)
 bool(false)
 
 Calling trait_exists() on existing trait with autoload explicitly enabled:
@@ -49,9 +49,9 @@ Calling trait_exists() on existing trait with autoload explicitly disabled:
 bool(true)
 
 Calling trait_exists() on non-existent trait with autoload unspecified:
-In __autoload(E)
+In autoload(E)
 bool(false)
 
 Calling trait_exists() on existing trait with autoload unspecified:
 bool(true)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
index 81df711cfa..4fd2b8d5af 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
@@ -8,9 +8,9 @@ Test trait_exists() function : usage variations - unexpected types for argument
  * Alias to functions: 
  */
 
-function __autoload($traitName) {
-	echo "In __autoload($traitName)\n";
-}
+spl_autoload_register(function ($traitName) {
+	echo "In autoload($traitName)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -88,15 +88,15 @@ Error: 8 - Undefined variable: undefined_var, %s(67)
 Error: 8 - Undefined variable: unset_var, %s(70)
 
 Arg value 0 
-In __autoload(0)
+In autoload(0)
 bool(false)
 
 Arg value 1 
-In __autoload(1)
+In autoload(1)
 bool(false)
 
 Arg value 12345 
-In __autoload(12345)
+In autoload(12345)
 bool(false)
 
 Arg value -2345 
@@ -109,7 +109,7 @@ Arg value -10.5
 bool(false)
 
 Arg value 101234567000 
-In __autoload(101234567000)
+In autoload(101234567000)
 bool(false)
 
 Arg value 1.07654321E-9 
@@ -150,14 +150,14 @@ Arg value
 bool(false)
 
 Arg value 1 
-In __autoload(1)
+In autoload(1)
 bool(false)
 
 Arg value  
 bool(false)
 
 Arg value 1 
-In __autoload(1)
+In autoload(1)
 bool(false)
 
 Arg value  
@@ -179,4 +179,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
index 365efffe41..50f2a0256f 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
@@ -8,9 +8,9 @@ Test trait_exists() function : usage variations  - unexpected types for argument
  * Alias to functions: 
  */
 
-function __autoload($traitName) {
-	echo "In __autoload($traitName)\n";
-}
+spl_autoload_register(function ($traitName) {
+	echo "In autoload($traitName)\n";
+});
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
 	echo "Error: $err_no - $err_msg, $filename($linenum)\n";
@@ -95,35 +95,35 @@ Arg value 0
 bool(false)
 
 Arg value 1 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 12345 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value -2345 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 10.5 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value -10.5 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 101234567000 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 1.07654321E-9 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value 0.5 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d)
 
@@ -158,14 +158,14 @@ Arg value
 bool(false)
 
 Arg value 1 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value  
 bool(false)
 
 Arg value 1 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value  
@@ -178,11 +178,11 @@ Arg value
 bool(false)
 
 Arg value string 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 
 Arg value string 
-In __autoload(string_val)
+In autoload(string_val)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(80)
 
@@ -195,4 +195,4 @@ bool(false)
 
 Arg value  
 bool(false)
-Done
\ No newline at end of file
+Done