Test cleanup

Author: arnaud-lb

Zend/tests/lazy_objects/clone_calls___clone_once.phpt

@@ -40,7 +40,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -56,7 +56,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 string(11) "initializer"
 string(5) "clone"
 bool(false)

Zend/tests/lazy_objects/clone_initialized.phpt

@@ -38,7 +38,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -53,7 +53,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 string(11) "initializer"
 bool(false)
 lazy proxy object(C)#%d (1) {

Zend/tests/lazy_objects/clone_initializer_exception.phpt

@@ -41,15 +41,15 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     throw new \Exception('initializer');
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
 Exception: initializer
 bool(true)
 lazy ghost object(C)#%d (0) {
 }
-# Virtual:
+# Proxy:
 Exception: initializer
 bool(true)
 lazy proxy object(C)#%d (0) {

Zend/tests/lazy_objects/clone_initializes.phpt

@@ -36,7 +36,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -51,7 +51,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 string(11) "initializer"
 bool(false)
 lazy proxy object(C)#%d (1) {

Zend/tests/lazy_objects/dtor_called_if_init.phpt

@@ -25,10 +25,10 @@ function ghost() {
     var_dump($obj->a);
 }
 
-function virtual() {
+function proxy() {
     $reflector = new ReflectionClass(C::class);
 
-    print "# Virtual:\n";
+    print "# Proxy:\n";
 
     print "In makeLazy\n";
     $obj = $reflector->newLazyProxy(function () {
@@ -41,7 +41,7 @@ function virtual() {
 }
 
 ghost();
-virtual();
+proxy();
 
 --EXPECTF--
 # Ghost:
@@ -54,7 +54,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 In makeLazy
 After makeLazy
 string(11) "initializer"

Zend/tests/lazy_objects/dtor_not_called_if_not_init.phpt

@@ -23,7 +23,7 @@ print "After newLazyGhost\n";
 // Does not call destructor
 $obj = null;
 
-print "# Virtual:\n";
+print "# Proxy:\n";
 
 print "In newLazyProxy\n";
 $obj = $reflector->newLazyProxy(function () {
@@ -38,6 +38,6 @@ $obj = null;
 # Ghost:
 In newLazyGhost
 After newLazyGhost
-# Virtual:
+# Proxy:
 In newLazyProxy
 After newLazyGhost

Zend/tests/lazy_objects/fetch_coalesce_initializes.phpt

@@ -32,7 +32,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 --EXPECTF--
 # Ghost:
 lazy ghost object(C)#%d (0) {
@@ -46,7 +46,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_coalesce_non_existing_initializes.phpt

@@ -32,7 +32,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 --EXPECTF--
 # Ghost:
 lazy ghost object(C)#%d (0) {
@@ -46,7 +46,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_declared_prop_initializes.phpt

@@ -36,7 +36,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C(1);
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -53,7 +53,7 @@ object(C)#%d (2) {
   ["b"]=>
   int(2)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["b"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_dynamic_prop_initializes.phpt

@@ -33,7 +33,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -48,7 +48,7 @@ object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_hook_may_not_initialize.phpt

@@ -39,7 +39,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C(1);
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -56,7 +56,7 @@ object(C)#%d (2) {
   ["b"]=>
   int(2)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["b"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_hook_virtual_may_initialize.phpt

@@ -40,7 +40,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C(1);
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -57,7 +57,7 @@ object(C)#%d (2) {
   ["b"]=>
   int(2)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["b"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_hook_virtual_may_not_initialize.phpt

@@ -37,7 +37,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C(1);
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -50,7 +50,7 @@ lazy ghost object(C)#%d (0) {
   ["b"]=>
   uninitialized(int)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["b"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_magic_prop_may_initialize.phpt

@@ -35,7 +35,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 --EXPECTF--
 # Ghost:
 lazy ghost object(C)#%d (0) {
@@ -49,7 +49,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_magic_prop_may_not_initialize.phpt

@@ -35,7 +35,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -48,7 +48,7 @@ lazy ghost object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_magic_prop_recursive_may_initialize.phpt

@@ -35,7 +35,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 --EXPECTF--
 # Ghost:
 lazy ghost object(C)#%d (0) {
@@ -51,7 +51,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_op_dynamic_error.phpt

@@ -37,7 +37,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     throw new Error("initializer");
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -50,7 +50,7 @@ lazy ghost object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_op_dynamic_prop_initializes.phpt

@@ -33,7 +33,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -50,7 +50,7 @@ object(C)#%d (2) {
   ["dynamic"]=>
   int(1)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_op_error.phpt

@@ -37,7 +37,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     throw new Error("initializer");
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -50,7 +50,7 @@ lazy ghost object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_op_initializes.phpt

@@ -33,7 +33,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new C();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -48,7 +48,7 @@ object(C)#%d (1) {
   ["a"]=>
   int(3)
 }
-# Virtual:
+# Proxy:
 lazy proxy object(C)#%d (0) {
   ["a"]=>
   uninitialized(int)

Zend/tests/lazy_objects/fetch_op_skipped_prop_does_not_initialize.phpt

@@ -46,7 +46,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
     return new c();
 });
 
-test('Virtual', $obj);
+test('Proxy', $obj);
 
 --EXPECTF--
 # Ghost:
@@ -69,7 +69,7 @@ object(C)#%d (2) {
   ["c"]=>
   uninitialized(int)
 }
-# Virtual:
+# Proxy:
 object(C)#%d (2) {
   ["a"]=>
   NULL