diff options
Diffstat (limited to 'tests/classes')
131 files changed, 319 insertions, 319 deletions
diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt index be2d0248cc..a70041ae16 100644 --- a/tests/classes/__call_001.phpt +++ b/tests/classes/__call_001.phpt @@ -5,7 +5,7 @@ ZE2 __call() class Caller { public $x = array(1, 2, 3); - + function __call($m, $a) { echo "Method $m called:\n"; var_dump($a); diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt index 9ecc0701f0..30662add36 100644 --- a/tests/classes/__call_003.phpt +++ b/tests/classes/__call_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Force pass-by-reference to __call +Force pass-by-reference to __call --FILE-- <?php class C @@ -9,16 +9,16 @@ Force pass-by-reference to __call $values[0][0] = 'changed'; } } - + $a = array('original'); - + $b = array('original'); $hack =& $b[0]; - + $c = new C; $c->f($a); $c->f($b); - + var_dump($a, $b); ?> --EXPECT-- diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt index a9997bf132..ca980c65f0 100644 --- a/tests/classes/__call_004.phpt +++ b/tests/classes/__call_004.phpt @@ -14,7 +14,7 @@ class B extends A { echo "In " . __METHOD__ . "($strMethod, array(" . implode(',',$arrArgs) . "))\n"; var_dump($this); } - + function test() { A::test1(1,'a'); B::test2(1,'a'); diff --git a/tests/classes/__call_005.phpt b/tests/classes/__call_005.phpt index 6e1584878e..33c4df8e49 100644 --- a/tests/classes/__call_005.phpt +++ b/tests/classes/__call_005.phpt @@ -1,5 +1,5 @@ --TEST-- -When __call() is invoked via ::, ensure private implementation of __call() in superclass is accessed without error. +When __call() is invoked via ::, ensure private implementation of __call() in superclass is accessed without error. --FILE-- <?php class A { diff --git a/tests/classes/__call_006.phpt b/tests/classes/__call_006.phpt index c3937393fd..e6efdefe9e 100644 --- a/tests/classes/__call_006.phpt +++ b/tests/classes/__call_006.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure exceptions are handled properly when thrown in __call. +Ensure exceptions are handled properly when thrown in __call. --FILE-- <?php class A { diff --git a/tests/classes/__call_007.phpt b/tests/classes/__call_007.phpt index cc7a2773bd..a1dd4594e9 100644 --- a/tests/classes/__call_007.phpt +++ b/tests/classes/__call_007.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure exceptions are handled properly when thrown in a statically declared __call. +Ensure exceptions are handled properly when thrown in a statically declared __call. --FILE-- <?php class A { diff --git a/tests/classes/__set__get_001.phpt b/tests/classes/__set__get_001.phpt index 3c9cb09b4a..244119a2d0 100644 --- a/tests/classes/__set__get_001.phpt +++ b/tests/classes/__set__get_001.phpt @@ -13,7 +13,7 @@ class setter { $r = $this->x[$nm]; echo "Returning: $r\n"; return $r; - } + } else { echo "Nothing!\n"; } @@ -21,11 +21,11 @@ class setter { function __set($nm, $val) { echo "Setting [$nm] to $val\n"; - + if (isset($this->x[$nm])) { $this->x[$nm] = $val; echo "OK!\n"; - } + } else { echo "Not OK!\n"; } @@ -42,7 +42,7 @@ $foo->a = 100; $foo->a++; $foo->z++; var_dump($foo); - + ?> --EXPECTF-- Setting [a] to 100 diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt index 86fc094f87..004edc973a 100644 --- a/tests/classes/__set__get_004.phpt +++ b/tests/classes/__set__get_004.phpt @@ -8,7 +8,7 @@ class Test { function __get($name) { if (isset($this->x[$name])) { return $this->x[$name]; - } + } else { return NULL; diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt index fd23cf6276..68cfb39df3 100644 --- a/tests/classes/__set__get_005.phpt +++ b/tests/classes/__set__get_005.phpt @@ -10,7 +10,7 @@ class Test echo __METHOD__ . "\n"; if (isset($this->x[$name])) { return $this->x[$name]; - } + } else { return NULL; diff --git a/tests/classes/__set_data_corrupt.phpt b/tests/classes/__set_data_corrupt.phpt index 8b51302ab3..4adf569978 100644 --- a/tests/classes/__set_data_corrupt.phpt +++ b/tests/classes/__set_data_corrupt.phpt @@ -6,7 +6,7 @@ $f = 'c="foo"'; class foo { const foobar=1; public $pp = array('t'=>null); - + function bar() { echo $this->t ='f'; } diff --git a/tests/classes/abstract_by_interface_001.phpt b/tests/classes/abstract_by_interface_001.phpt index 7565fdf45f..4a746d0d22 100644 --- a/tests/classes/abstract_by_interface_001.phpt +++ b/tests/classes/abstract_by_interface_001.phpt @@ -16,7 +16,7 @@ abstract class Derived extends Root implements MyInterface { class Leaf extends Derived { - function MyInterfaceFunc() {} + function MyInterfaceFunc() {} } var_dump(new Leaf); diff --git a/tests/classes/abstract_by_interface_002.phpt b/tests/classes/abstract_by_interface_002.phpt index 77c5619dfe..a05660b5b9 100644 --- a/tests/classes/abstract_by_interface_002.phpt +++ b/tests/classes/abstract_by_interface_002.phpt @@ -16,7 +16,7 @@ abstract class Derived extends Root implements MyInterface { class Leaf extends Derived { - static function MyInterfaceFunc() {} + static function MyInterfaceFunc() {} } var_dump(new Leaf); diff --git a/tests/classes/array_access_005.phpt b/tests/classes/array_access_005.phpt index dcb873ff56..92ddeccaf2 100644 --- a/tests/classes/array_access_005.phpt +++ b/tests/classes/array_access_005.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 ArrayAccess and sub Arrays --FILE-- -<?php +<?php class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Joe')); } diff --git a/tests/classes/array_access_006.phpt b/tests/classes/array_access_006.phpt index 342a7e5107..babc808cb4 100644 --- a/tests/classes/array_access_006.phpt +++ b/tests/classes/array_access_006.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 ArrayAccess and ASSIGN_OP operators (+=) --FILE-- -<?php +<?php class OverloadedArray implements ArrayAccess { public $realArray; - + function __construct() { $this->realArray = array(1,2,3); } diff --git a/tests/classes/array_access_007.phpt b/tests/classes/array_access_007.phpt index 42187fe5d5..801c8e846c 100644 --- a/tests/classes/array_access_007.phpt +++ b/tests/classes/array_access_007.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 ArrayAccess and [] assignment --FILE-- -<?php +<?php class OverloadedArray implements ArrayAccess { public $realArray; - + function __construct() { $this->realArray = array(); } diff --git a/tests/classes/array_access_008.phpt b/tests/classes/array_access_008.phpt index 9979889174..0bb793b2b3 100644 --- a/tests/classes/array_access_008.phpt +++ b/tests/classes/array_access_008.phpt @@ -1,11 +1,11 @@ --TEST-- -ZE2 ArrayAccess and ASSIGN_OP operators (.=) +ZE2 ArrayAccess and ASSIGN_OP operators (.=) --FILE-- -<?php +<?php class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); } diff --git a/tests/classes/array_access_009.phpt b/tests/classes/array_access_009.phpt index 3862240261..7da9084d24 100644 --- a/tests/classes/array_access_009.phpt +++ b/tests/classes/array_access_009.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 ArrayAccess and ArrayProxyAccess, ArrayProxy --FILE-- -<?php +<?php // NOTE: This will become part of SPL @@ -16,7 +16,7 @@ class ArrayProxy implements ArrayAccess { private $object; private $element; - + function __construct(ArrayProxyAccess $object, $element) { echo __METHOD__ . "($element)\n"; @@ -53,7 +53,7 @@ class ArrayProxy implements ArrayAccess class Peoples implements ArrayProxyAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); @@ -88,7 +88,7 @@ class Peoples implements ArrayProxyAccess { $this->person[$element][$index] = $value; } - + function proxyUnset($element, $index) { unset($this->person[$element][$index]); diff --git a/tests/classes/array_access_010.phpt b/tests/classes/array_access_010.phpt index ad374d278c..3df64fcc7e 100644 --- a/tests/classes/array_access_010.phpt +++ b/tests/classes/array_access_010.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 ArrayAccess and ArrayReferenceProxy with references --FILE-- -<?php +<?php // NOTE: This will become part of SPL @@ -9,7 +9,7 @@ class ArrayReferenceProxy implements ArrayAccess { private $object; private $element; - + function __construct(ArrayAccess $object, array &$element) { echo __METHOD__ . "(Array)\n"; @@ -41,7 +41,7 @@ class ArrayReferenceProxy implements ArrayAccess class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); diff --git a/tests/classes/array_access_011.phpt b/tests/classes/array_access_011.phpt index aa20a56d39..36269c0b41 100644 --- a/tests/classes/array_access_011.phpt +++ b/tests/classes/array_access_011.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 ArrayAccess and ArrayAccessReferenceProxy with references to main array --FILE-- -<?php +<?php // NOTE: This will become part of SPL @@ -10,7 +10,7 @@ class ArrayAccessReferenceProxy implements ArrayAccess private $object; private $oarray; private $element; - + function __construct(ArrayAccess $object, array &$array, $element) { echo __METHOD__ . "($element)\n"; @@ -43,7 +43,7 @@ class ArrayAccessReferenceProxy implements ArrayAccess class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); diff --git a/tests/classes/assign_op_property_001.phpt b/tests/classes/assign_op_property_001.phpt index 21e131cfa4..cd5fcff469 100644 --- a/tests/classes/assign_op_property_001.phpt +++ b/tests/classes/assign_op_property_001.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 assign_op property of overloaded object --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index 6c09c4e04d..22bbb6bc7a 100644 --- a/tests/classes/autoload_001.phpt +++ b/tests/classes/autoload_001.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and class_exists --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index ecb1a44512..3ea84370da 100644 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and get_class_methods --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt index f79b85a9f0..cb82c06e19 100644 --- a/tests/classes/autoload_003.phpt +++ b/tests/classes/autoload_003.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and derived classes --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt index 1f754ca030..f5830ca6cd 100644 --- a/tests/classes/autoload_004.phpt +++ b/tests/classes/autoload_004.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and recursion --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt index 26f4d6ae10..c21a442056 100644 --- a/tests/classes/autoload_005.phpt +++ b/tests/classes/autoload_005.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload from destructor --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt index 092e2e2252..69598afc8d 100644 --- a/tests/classes/autoload_006.phpt +++ b/tests/classes/autoload_006.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload from destructor --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt index ebe691ca28..63f1ea9801 100644 --- a/tests/classes/autoload_009.phpt +++ b/tests/classes/autoload_009.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure type hints for unknown types do not trigger autoload. +Ensure type hints for unknown types do not trigger autoload. --FILE-- <?php spl_autoload_register(function ($name) { diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt index 53792d6f6b..4a21fad338 100644 --- a/tests/classes/autoload_018.phpt +++ b/tests/classes/autoload_018.phpt @@ -4,15 +4,15 @@ Ensure __autoload() allows for recursive calls if the class name differs. <?php spl_autoload_register(function ($name) { echo "IN: autoload($name)\n"; - + static $i = 0; if ($i++ > 10) { echo "-> Recursion detected - as expected.\n"; return; } - + class_exists('UndefinedClass' . $i); - + echo "OUT: autoload($name)\n"; }); diff --git a/tests/classes/bug23951.phpt b/tests/classes/bug23951.phpt index 2e272b87fe..74b9332d69 100644 --- a/tests/classes/bug23951.phpt +++ b/tests/classes/bug23951.phpt @@ -7,15 +7,15 @@ define('FOO1', 1); define('FOO2', 2); class A { - + public $a_var = array(FOO1=>'foo1_value', FOO2=>'foo2_value'); - + } class B extends A { - - public $b_var = 'foo'; - + + public $b_var = 'foo'; + } $a = new A; diff --git a/tests/classes/bug29446.phpt b/tests/classes/bug29446.phpt index 573f136ce0..9ce2309cba 100644 --- a/tests/classes/bug29446.phpt +++ b/tests/classes/bug29446.phpt @@ -6,7 +6,7 @@ Bug #29446 (ZE allows multiple declarations of the same class constant) class testClass { const TEST_CONST = 'test'; const TEST_CONST = 'test1'; - + function testClass() { echo self::TEST_CONST; } diff --git a/tests/classes/class_example.phpt b/tests/classes/class_example.phpt index 621958b1bd..b0e9cf8f6e 100644 --- a/tests/classes/class_example.phpt +++ b/tests/classes/class_example.phpt @@ -2,7 +2,7 @@ Classes general test --FILE-- -<?php +<?php /* pretty nifty object oriented code! */ diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index 37120579f6..03af299ba8 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -6,31 +6,31 @@ Class constant declarations $def = 456; define('DEFINED_TO_VAR', $def); define('DEFINED_TO_UNDEF_VAR', $undef); - + class C { const c0 = UNDEFINED; - + const c1 = 1, c2 = 1.5; const c3 = + 1, c4 = + 1.5; const c5 = -1, c6 = -1.5; - + const c7 = __LINE__; const c8 = __FILE__; const c9 = __CLASS__; const c10 = __METHOD__; const c11 = __FUNCTION__; - + const c12 = DEFINED; const c13 = DEFINED_TO_VAR; const c14 = DEFINED_TO_UNDEF_VAR; - + const c15 = "hello1"; const c16 = 'hello2'; const c17 = C::c16; const c18 = self::c17; } - + echo "\nAttempt to access various kinds of class constants:\n"; var_dump(C::c0); var_dump(C::c1); @@ -51,10 +51,10 @@ Class constant declarations var_dump(C::c16); var_dump(C::c17); var_dump(C::c18); - + echo "\nExpecting fatal error:\n"; var_dump(C::c19); - + echo "\nYou should not see this."; ?> --EXPECTF-- diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt index 0e53ca97c8..006e5fbab9 100644 --- a/tests/classes/constants_basic_002.phpt +++ b/tests/classes/constants_basic_002.phpt @@ -6,14 +6,14 @@ Basic class support - defining and reading a class constant. { const myConst = "hello"; } - + echo "\nRead class constant.\n"; var_dump(aclass::myConst); - + echo "\nFail to read class constant from instance.\n"; $myInstance = new aclass(); var_dump($myInstance->myConst); - + echo "\nClass constant not visible in object var_dump.\n"; var_dump($myInstance) ?> diff --git a/tests/classes/constants_basic_003.phpt b/tests/classes/constants_basic_003.phpt index cceabd8d7d..abf48e3c82 100644 --- a/tests/classes/constants_basic_003.phpt +++ b/tests/classes/constants_basic_003.phpt @@ -10,12 +10,12 @@ Ensure class properties and constants can be defined in terms of constants that const ca = A::MY_CONST; const cc = C::MY_CONST; } - + class C { const MY_CONST = "hello from C"; } - + var_dump(B::$a); var_dump(B::$c); var_dump(B::ca); diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt index cade66844b..e893768629 100644 --- a/tests/classes/constants_basic_004.phpt +++ b/tests/classes/constants_basic_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Test properties with array default values using class constants as keys and values. +Test properties with array default values using class constants as keys and values. --FILE-- <?php class X @@ -8,33 +8,33 @@ Test properties with array default values using class constants as keys and valu public static $sa_x = array(B::KEY => B::VALUE); public $a_x = array(B::KEY => B::VALUE); } - + class B { const KEY = "key"; const VALUE = "value"; - + // Static and instance array using class constants with self public static $sa_b = array(self::KEY => self::VALUE); public $a_b = array(self::KEY => self::VALUE); } - + class C extends B { - // Static and instance array using class constants with parent + // Static and instance array using class constants with parent public static $sa_c_parent = array(parent::KEY => parent::VALUE); public $a_c_parent = array(parent::KEY => parent::VALUE); - + // Static and instance array using class constants with self (constants should be inherited) public static $sa_c_self = array(self::KEY => self::VALUE); public $a_c_self = array(self::KEY => self::VALUE); - + // Should also include inherited properties from B. } - + echo "\nStatic properties:\n"; var_dump(X::$sa_x, B::$sa_b, C::$sa_b, C::$sa_c_parent, C::$sa_c_self); - + echo "\nInstance properties:\n"; $x = new x; $b = new B; diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt index a97be1004a..55d23f77b1 100644 --- a/tests/classes/constants_basic_005.phpt +++ b/tests/classes/constants_basic_005.phpt @@ -1,5 +1,5 @@ --TEST-- -Test constants with default values based on other constants. +Test constants with default values based on other constants. --FILE-- <?php class C diff --git a/tests/classes/constants_basic_006.phpt b/tests/classes/constants_basic_006.phpt index 904593ea9b..a293c0bede 100644 --- a/tests/classes/constants_basic_006.phpt +++ b/tests/classes/constants_basic_006.phpt @@ -7,16 +7,16 @@ Ensure class constants are not evaluated when a class is looked up to resolve in const X = E::A; public static $a = array(K => D::V, E::A => K); } - + eval('class D extends C { const V = \'test\'; }'); - + class E extends D { const A = "hello"; } - + define('K', "nasty"); - + var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a); ?> --EXPECT-- diff --git a/tests/classes/constants_comments_001.phpt b/tests/classes/constants_comments_001.phpt index dbdd67c332..297ad9f956 100644 --- a/tests/classes/constants_comments_001.phpt +++ b/tests/classes/constants_comments_001.phpt @@ -5,17 +5,17 @@ opcache.save_comments=1 --FILE-- <?php class X { - /** comment X1 */ + /** comment X1 */ const X1 = 1; const X2 = 2; - /** comment X3 */ + /** comment X3 */ const X3 = 3; } class Y extends X { - /** comment Y1 */ + /** comment Y1 */ const Y1 = 1; const Y2 = 2; - /** comment Y3 */ + /** comment Y3 */ const Y3 = 3; } $r = new ReflectionClass('Y'); diff --git a/tests/classes/constants_error_003.phpt b/tests/classes/constants_error_003.phpt index c67768c809..b56679b388 100644 --- a/tests/classes/constants_error_003.phpt +++ b/tests/classes/constants_error_003.phpt @@ -6,12 +6,12 @@ Basic class support - attempting to pass a class constant by reference. { const myConst = "hello"; } - + function f(&$a) { $a = "changed"; } - + f(aclass::myConst); var_dump(aclass::myConst); ?> diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt index 27777f8772..b7f668909b 100644 --- a/tests/classes/constants_error_004.phpt +++ b/tests/classes/constants_error_004.phpt @@ -6,7 +6,7 @@ Class constant whose initial value references a non-existent class { const c1 = D::hello; } - + $a = new C(); ?> --EXPECTF-- diff --git a/tests/classes/constants_error_006.phpt b/tests/classes/constants_error_006.phpt index f3f14b867b..01839ba7ef 100644 --- a/tests/classes/constants_error_006.phpt +++ b/tests/classes/constants_error_006.phpt @@ -6,7 +6,7 @@ Basic class support - attempting to modify a class constant by assignment { const myConst = "hello"; } - + echo "\nTrying to modify a class constant directly - should be parse error.\n"; aclass::myConst = "no!!"; var_dump(aclass::myConst); diff --git a/tests/classes/constants_error_007.phpt b/tests/classes/constants_error_007.phpt index 4be8d885f5..54b32e4ab2 100644 --- a/tests/classes/constants_error_007.phpt +++ b/tests/classes/constants_error_007.phpt @@ -6,7 +6,7 @@ Basic class support - attempting to create a reference to a class constant { const myConst = "hello"; } - + echo "\nAttempting to create a reference to a class constant - should be parse error.\n"; $a = &aclass::myConst; ?> diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index 78d4efb32f..5e240571d7 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -16,7 +16,7 @@ class base { $this->name = 'base'; print_r($this); } - + function __destruct() { echo __CLASS__ . "::" . __FUNCTION__ . "\n"; print_r($this); diff --git a/tests/classes/ctor_failure.phpt b/tests/classes/ctor_failure.phpt index b7d3b64dda..f86b0cc5f8 100644 --- a/tests/classes/ctor_failure.phpt +++ b/tests/classes/ctor_failure.phpt @@ -9,7 +9,7 @@ class Test echo __METHOD__ . "($msg)\n"; throw new Exception($msg); } - + function __destruct() { echo __METHOD__ . "\n"; } diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt index e7288bb968..685c7dbe41 100644 --- a/tests/classes/ctor_visibility.phpt +++ b/tests/classes/ctor_visibility.phpt @@ -18,7 +18,7 @@ class Derived extends Test echo __METHOD__ . "()\n"; parent::__construct(); } - + static function f() { new Derived; @@ -49,7 +49,7 @@ class DerivedPriv extends TestPriv echo __METHOD__ . "()\n"; parent::__construct(); } - + static function f() { new DerivedPriv; diff --git a/tests/classes/destructor_and_echo.phpt b/tests/classes/destructor_and_echo.phpt index 0a253593a5..7d5b57c8ac 100644 --- a/tests/classes/destructor_and_echo.phpt +++ b/tests/classes/destructor_and_echo.phpt @@ -8,7 +8,7 @@ class Test function __construct() { echo __METHOD__ . "\n"; } - + function __destruct() { echo __METHOD__ . "\n"; } diff --git a/tests/classes/destructor_and_globals.phpt b/tests/classes/destructor_and_globals.phpt index 9caf0f1026..1276d28348 100644 --- a/tests/classes/destructor_and_globals.phpt +++ b/tests/classes/destructor_and_globals.phpt @@ -28,7 +28,7 @@ class counter { global $test_cnt; $test_cnt--; } - + static public function destroy(&$obj) { $obj = NULL; } diff --git a/tests/classes/destructor_inheritance.phpt b/tests/classes/destructor_inheritance.phpt index f267a740ae..c527c04b4f 100644 --- a/tests/classes/destructor_inheritance.phpt +++ b/tests/classes/destructor_inheritance.phpt @@ -6,7 +6,7 @@ class base { function __construct() { echo __METHOD__ . "\n"; } - + function __destruct() { echo __METHOD__ . "\n"; } diff --git a/tests/classes/factory_and_singleton_001.phpt b/tests/classes/factory_and_singleton_001.phpt index 970c017f4b..dbbf07cfad 100644 --- a/tests/classes/factory_and_singleton_001.phpt +++ b/tests/classes/factory_and_singleton_001.phpt @@ -41,7 +41,7 @@ class test { return NULL; } } - + static public function count() { return test::$cnt; } diff --git a/tests/classes/factory_and_singleton_002.phpt b/tests/classes/factory_and_singleton_002.phpt index 4812571497..6748321242 100644 --- a/tests/classes/factory_and_singleton_002.phpt +++ b/tests/classes/factory_and_singleton_002.phpt @@ -41,7 +41,7 @@ class test { return NULL; } } - + static public function count() { return test::$cnt; } diff --git a/tests/classes/incdec_property_001.phpt b/tests/classes/incdec_property_001.phpt index 97a24d30b6..8517a9fc4d 100644 --- a/tests/classes/incdec_property_001.phpt +++ b/tests/classes/incdec_property_001.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 post increment/decrement property of overloaded object --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/incdec_property_002.phpt b/tests/classes/incdec_property_002.phpt index c1d7dded3b..930a58dc07 100644 --- a/tests/classes/incdec_property_002.phpt +++ b/tests/classes/incdec_property_002.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 post increment/decrement property of overloaded object with assignment --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/incdec_property_003.phpt b/tests/classes/incdec_property_003.phpt index 1a923849f4..edf3c00963 100644 --- a/tests/classes/incdec_property_003.phpt +++ b/tests/classes/incdec_property_003.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 pre increment/decrement property of overloaded object --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/incdec_property_004.phpt b/tests/classes/incdec_property_004.phpt index 05e3b445ac..2267d568af 100644 --- a/tests/classes/incdec_property_004.phpt +++ b/tests/classes/incdec_property_004.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 pre increment/decrement property of overloaded object with assignment --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/inheritance.phpt b/tests/classes/inheritance.phpt index 070ad9147d..3f7e38b9ef 100644 --- a/tests/classes/inheritance.phpt +++ b/tests/classes/inheritance.phpt @@ -1,7 +1,7 @@ --TEST-- Classes inheritance test --FILE-- -<?php +<?php /* Inheritance test. Pretty nifty if I do say so myself! */ diff --git a/tests/classes/inheritance_005.phpt b/tests/classes/inheritance_005.phpt index 7399bf1168..8c5167f4bf 100644 --- a/tests/classes/inheritance_005.phpt +++ b/tests/classes/inheritance_005.phpt @@ -9,25 +9,25 @@ Check for inherited old-style constructor. echo "In " . __METHOD__ . "\n"; } } - + class B extends A { } - + class C extends B { } - - + + echo "About to construct new B: \n"; $b = new B; - + echo "Is B::B() callable?\n"; var_dump(is_callable(array($b, "B"))); - + echo "Is B::A() callable?\n"; var_dump(is_callable(array($b, "A"))); - + echo "About to construct new C: \n"; $c = new C; diff --git a/tests/classes/interface_and_extends.phpt b/tests/classes/interface_and_extends.phpt index 1c23d31ca6..8bb1ec05f1 100644 --- a/tests/classes/interface_and_extends.phpt +++ b/tests/classes/interface_and_extends.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 a class cannot extend an interface +ZE2 a class cannot extend an interface --FILE-- <?php diff --git a/tests/classes/interface_class.phpt b/tests/classes/interface_class.phpt index 46deb490ed..8975994024 100644 --- a/tests/classes/interface_class.phpt +++ b/tests/classes/interface_class.phpt @@ -4,7 +4,7 @@ ZE2 A class can only implement interfaces <?php class base { } - + class derived implements base { } ?> diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt index f982a4a64e..046f3b1c5a 100644 --- a/tests/classes/interface_constant_inheritance_001.phpt +++ b/tests/classes/interface_constant_inheritance_001.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure an interface may not shadow an inherited constant. +Ensure an interface may not shadow an inherited constant. --FILE-- <?php interface I1 { diff --git a/tests/classes/interface_constant_inheritance_002.phpt b/tests/classes/interface_constant_inheritance_002.phpt index af4ce695f7..952dbaf7f4 100644 --- a/tests/classes/interface_constant_inheritance_002.phpt +++ b/tests/classes/interface_constant_inheritance_002.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure a class may not shadow a constant inherited from an interface. +Ensure a class may not shadow a constant inherited from an interface. --FILE-- <?php interface I { diff --git a/tests/classes/interface_constant_inheritance_003.phpt b/tests/classes/interface_constant_inheritance_003.phpt index 6b4139bd98..908ca7b4d6 100644 --- a/tests/classes/interface_constant_inheritance_003.phpt +++ b/tests/classes/interface_constant_inheritance_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure a class may not inherit two constants with the same name from two separate interfaces. +Ensure a class may not inherit two constants with the same name from two separate interfaces. --FILE-- <?php interface I1 { diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt index 7f2d3e514f..aca9865eb1 100644 --- a/tests/classes/interface_constant_inheritance_004.phpt +++ b/tests/classes/interface_constant_inheritance_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure a class may implement two interfaces which include the same constant (due to inheritance). +Ensure a class may implement two interfaces which include the same constant (due to inheritance). --FILE-- <?php interface IA { diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt index e36a3c4553..8fbfcba7ff 100644 --- a/tests/classes/interface_doubled.phpt +++ b/tests/classes/interface_doubled.phpt @@ -6,7 +6,7 @@ ZE2 An interface extends base interfaces interface if_a { function f_a(); } - + interface if_b { function f_b(); } diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt index fd303e0913..e224c5bd23 100644 --- a/tests/classes/interface_implemented.phpt +++ b/tests/classes/interface_implemented.phpt @@ -6,7 +6,7 @@ ZE2 An interface is inherited interface if_a { function f_a(); } - + interface if_b extends if_a { function f_b(); } diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt index dffd6b10e2..04b0e29701 100644 --- a/tests/classes/interface_instantiate.phpt +++ b/tests/classes/interface_instantiate.phpt @@ -6,7 +6,7 @@ ZE2 An interface cannot be instantiated interface if_a { function f_a(); } - + $t = new if_a(); ?> diff --git a/tests/classes/interface_must_be_implemented.phpt b/tests/classes/interface_must_be_implemented.phpt index cd7c815f50..7dc39436e9 100644 --- a/tests/classes/interface_must_be_implemented.phpt +++ b/tests/classes/interface_must_be_implemented.phpt @@ -6,7 +6,7 @@ ZE2 An interface must be implemented interface if_a { function f_a(); } - + class derived_a implements if_a { } diff --git a/tests/classes/interface_optional_arg_003.phpt b/tests/classes/interface_optional_arg_003.phpt index 8685e3d0f1..cf583fe204 100644 --- a/tests/classes/interface_optional_arg_003.phpt +++ b/tests/classes/interface_optional_arg_003.phpt @@ -1,7 +1,7 @@ --TEST-- default argument value in and in implementing class with interface in included file --FILE-- -<?php +<?php include 'interface_optional_arg_003.inc'; class C implements I { diff --git a/tests/classes/iterators_001.phpt b/tests/classes/iterators_001.phpt index 548bed53ce..e4060e375f 100644 --- a/tests/classes/iterators_001.phpt +++ b/tests/classes/iterators_001.phpt @@ -37,7 +37,7 @@ class c_iter implements Iterator { } } } - + class c implements IteratorAggregate { public $max = 3; diff --git a/tests/classes/iterators_002.phpt b/tests/classes/iterators_002.phpt index 6f93d1e1f9..5e1ceb6208 100644 --- a/tests/classes/iterators_002.phpt +++ b/tests/classes/iterators_002.phpt @@ -41,7 +41,7 @@ class c_iter implements Iterator { echo __METHOD__ . "\n"; } } - + class c implements IteratorAggregate { public $max = 3; diff --git a/tests/classes/iterators_003.phpt b/tests/classes/iterators_003.phpt index 71009e0269..f417478d49 100644 --- a/tests/classes/iterators_003.phpt +++ b/tests/classes/iterators_003.phpt @@ -31,7 +31,7 @@ class c_iter implements Iterator { return $this->num; } } - + class c implements IteratorAggregate { public $max = 4; diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt index 564f15de54..7baa077f2b 100644 --- a/tests/classes/iterators_006.phpt +++ b/tests/classes/iterators_006.phpt @@ -45,7 +45,7 @@ class a implements IteratorAggregate { $array = new a(); foreach ($array as $property => $value) { - print "$property: $value\n"; + print "$property: $value\n"; } #$array = $array->getIterator(); @@ -58,13 +58,13 @@ echo "===2nd===\n"; $array = new ai(); foreach ($array as $property => $value) { - print "$property: $value\n"; + print "$property: $value\n"; } echo "===3rd===\n"; foreach ($array as $property => $value) { - print "$property: $value\n"; + print "$property: $value\n"; } ?> diff --git a/tests/classes/iterators_007.phpt b/tests/classes/iterators_007.phpt index f2638b31dc..87b7e5318b 100644 --- a/tests/classes/iterators_007.phpt +++ b/tests/classes/iterators_007.phpt @@ -6,7 +6,7 @@ class Test implements Iterator { public $arr = array(1, 2, 3); public $x = 0; - + public function rewind() { if ($this->x == 0) throw new Exception(__METHOD__); reset($this->arr); } public function current() { if ($this->x == 1) throw new Exception(__METHOD__); return current($this->arr); } public function key() { if ($this->x == 2) throw new Exception(__METHOD__); return key($this->arr); } diff --git a/tests/classes/iterators_008.phpt b/tests/classes/iterators_008.phpt index 13a8b165cd..26c8e01704 100644 --- a/tests/classes/iterators_008.phpt +++ b/tests/classes/iterators_008.phpt @@ -5,31 +5,31 @@ Ensure plain userspace superclass does not override special iterator behaviour o Class C {} class D extends C implements Iterator { - + private $counter = 2; - + public function valid() { echo __METHOD__ . "($this->counter)\n"; - return $this->counter; + return $this->counter; } - + public function next() { - $this->counter--; + $this->counter--; echo __METHOD__ . "($this->counter)\n"; } - + public function rewind() { echo __METHOD__ . "($this->counter)\n"; } - + public function current() { echo __METHOD__ . "($this->counter)\n"; } - + public function key() { echo __METHOD__ . "($this->counter)\n"; } - + } foreach (new D as $x) {} diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt index e4e269f070..5b6b725bc2 100644 --- a/tests/classes/method_call_variation_001.phpt +++ b/tests/classes/method_call_variation_001.phpt @@ -13,10 +13,10 @@ In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global fun $c = new C; $c->functions[0] = 'foo'; $c->functions[1][2][3][4] = 'foo'; - + $c->$name[0](1, 2); $c->$name[1][2][3][4](3, 4); - + $c->functions[0](5, 6); $c->functions[1][2][3][4](7, 8); ?> diff --git a/tests/classes/method_override_optional_arg_002.phpt b/tests/classes/method_override_optional_arg_002.phpt index c62e3a562e..254392718b 100644 --- a/tests/classes/method_override_optional_arg_002.phpt +++ b/tests/classes/method_override_optional_arg_002.phpt @@ -1,5 +1,5 @@ --TEST-- -Omitting optional arg in method inherited from abstract class +Omitting optional arg in method inherited from abstract class --FILE-- <?php diff --git a/tests/classes/object_reference_001.phpt b/tests/classes/object_reference_001.phpt index ca5bbc5abe..9842ac00f5 100644 --- a/tests/classes/object_reference_001.phpt +++ b/tests/classes/object_reference_001.phpt @@ -5,7 +5,7 @@ ZE2 object references class Foo { public $name; - + function __construct() { $this->name = "I'm Foo!\n"; } diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt index 9b90c9c1a7..895affac75 100644 --- a/tests/classes/private_006.phpt +++ b/tests/classes/private_006.phpt @@ -14,7 +14,7 @@ class first { first::do_show(); -class second extends first { +class second extends first { } second::do_show(); diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt index 272a334bfa..1c678601b6 100644 --- a/tests/classes/private_006b.phpt +++ b/tests/classes/private_006b.phpt @@ -16,7 +16,7 @@ class first { $t1 = new first(); $t1->do_show(); -class second extends first { +class second extends first { } //$t2 = new second(); diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt index 53bc7be059..abc2258bc2 100644 --- a/tests/classes/private_007.phpt +++ b/tests/classes/private_007.phpt @@ -12,7 +12,7 @@ class Bar { } } class Foo extends Bar { - public static function priv() { + public static function priv() { echo "Foo::priv()\n"; } } diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt index 62a65f4cee..3272d0c8a0 100644 --- a/tests/classes/private_007b.phpt +++ b/tests/classes/private_007b.phpt @@ -12,7 +12,7 @@ class Bar { } } class Foo extends Bar { - public function priv() { + public function priv() { echo "Foo::priv()\n"; } } diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt index 5ab448e437..4d8fd9eeb0 100644 --- a/tests/classes/private_members.phpt +++ b/tests/classes/private_members.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 A private member is +ZE2 A private member is --FILE-- <?php diff --git a/tests/classes/property_override_privateStatic_private.phpt b/tests/classes/property_override_privateStatic_private.phpt index b2985add7d..5be1eaf509 100644 --- a/tests/classes/property_override_privateStatic_private.phpt +++ b/tests/classes/property_override_privateStatic_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as private. echo self::$p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as private. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_privateStatic_privateStatic.phpt b/tests/classes/property_override_privateStatic_privateStatic.phpt index f435516a3f..2a1488a319 100644 --- a/tests/classes/property_override_privateStatic_privateStatic.phpt +++ b/tests/classes/property_override_privateStatic_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as private static. echo self::$p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as private static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_privateStatic_protected.phpt b/tests/classes/property_override_privateStatic_protected.phpt index fac66c32bb..8e570ddbad 100644 --- a/tests/classes/property_override_privateStatic_protected.phpt +++ b/tests/classes/property_override_privateStatic_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as protected. echo self::$p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as protected. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_privateStatic_protectedStatic.phpt b/tests/classes/property_override_privateStatic_protectedStatic.phpt index 08c0b22704..03e1abddf2 100644 --- a/tests/classes/property_override_privateStatic_protectedStatic.phpt +++ b/tests/classes/property_override_privateStatic_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as protected static. echo self::$p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as protected static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_privateStatic_public.phpt b/tests/classes/property_override_privateStatic_public.phpt index 7242371003..1db49f9845 100644 --- a/tests/classes/property_override_privateStatic_public.phpt +++ b/tests/classes/property_override_privateStatic_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as public. echo self::$p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as public. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_privateStatic_publicStatic.phpt b/tests/classes/property_override_privateStatic_publicStatic.phpt index 1fe43fb619..2a18747a30 100644 --- a/tests/classes/property_override_privateStatic_publicStatic.phpt +++ b/tests/classes/property_override_privateStatic_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as public static. echo self::$p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as public static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_private_private.phpt b/tests/classes/property_override_private_private.phpt index 2d45f33430..74184d111a 100644 --- a/tests/classes/property_override_private_private.phpt +++ b/tests/classes/property_override_private_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as private. echo $this->p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited private property as private. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_private_privateStatic.phpt b/tests/classes/property_override_private_privateStatic.phpt index 1bc3c9fe52..3aead95c0c 100644 --- a/tests/classes/property_override_private_privateStatic.phpt +++ b/tests/classes/property_override_private_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as private static. echo $this->p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited private property as private static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_private_protected.phpt b/tests/classes/property_override_private_protected.phpt index d284272d02..25f6e5218f 100644 --- a/tests/classes/property_override_private_protected.phpt +++ b/tests/classes/property_override_private_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as protected. echo $this->p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited private property as protected. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_private_protectedStatic.phpt b/tests/classes/property_override_private_protectedStatic.phpt index c7c54eab95..6ccc953503 100644 --- a/tests/classes/property_override_private_protectedStatic.phpt +++ b/tests/classes/property_override_private_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as protected static. echo $this->p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited private property as protected static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_private_public.phpt b/tests/classes/property_override_private_public.phpt index 6468432d18..e54d1370de 100644 --- a/tests/classes/property_override_private_public.phpt +++ b/tests/classes/property_override_private_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as public. echo $this->p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited private property as public. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_private_publicStatic.phpt b/tests/classes/property_override_private_publicStatic.phpt index 4057f83390..67c44a3f30 100644 --- a/tests/classes/property_override_private_publicStatic.phpt +++ b/tests/classes/property_override_private_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as public static. echo $this->p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited private property as public static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_protectedStatic_private.phpt b/tests/classes/property_override_protectedStatic_private.phpt index 18e9c78a13..712f51cd3c 100644 --- a/tests/classes/property_override_protectedStatic_private.phpt +++ b/tests/classes/property_override_protectedStatic_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as private. echo self::$p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as private. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protectedStatic_privateStatic.phpt b/tests/classes/property_override_protectedStatic_privateStatic.phpt index 688621077d..72e6e8a0a2 100644 --- a/tests/classes/property_override_protectedStatic_privateStatic.phpt +++ b/tests/classes/property_override_protectedStatic_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as private static. echo self::$p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as private static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_protectedStatic_protected.phpt b/tests/classes/property_override_protectedStatic_protected.phpt index 0e5fdd301c..b6780586c4 100644 --- a/tests/classes/property_override_protectedStatic_protected.phpt +++ b/tests/classes/property_override_protectedStatic_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as protected. echo self::$p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as protected. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protectedStatic_protectedStatic.phpt b/tests/classes/property_override_protectedStatic_protectedStatic.phpt index d2d1c0c379..c81a60423e 100644 --- a/tests/classes/property_override_protectedStatic_protectedStatic.phpt +++ b/tests/classes/property_override_protectedStatic_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as protected static. echo self::$p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as protected static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_protectedStatic_public.phpt b/tests/classes/property_override_protectedStatic_public.phpt index 6303325590..14daa455a6 100644 --- a/tests/classes/property_override_protectedStatic_public.phpt +++ b/tests/classes/property_override_protectedStatic_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as public. echo self::$p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as public. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt index 29b67655ff..a214af9994 100644 --- a/tests/classes/property_override_protectedStatic_publicStatic.phpt +++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as public static. echo self::$p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as public static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_protected_private.phpt b/tests/classes/property_override_protected_private.phpt index 22cceda175..9875dd59b8 100644 --- a/tests/classes/property_override_protected_private.phpt +++ b/tests/classes/property_override_protected_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_ echo $this->p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_ echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protected_privateStatic.phpt b/tests/classes/property_override_protected_privateStatic.phpt index fb7102cb3e..7193178d48 100644 --- a/tests/classes/property_override_protected_privateStatic.phpt +++ b/tests/classes/property_override_protected_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as private static. echo $this->p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as private static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_protected_protected.phpt b/tests/classes/property_override_protected_protected.phpt index 096f53d515..c302639fbb 100644 --- a/tests/classes/property_override_protected_protected.phpt +++ b/tests/classes/property_override_protected_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as protected. echo $this->p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as protected. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protected_protectedStatic.phpt b/tests/classes/property_override_protected_protectedStatic.phpt index 1ce4130265..abac19a793 100644 --- a/tests/classes/property_override_protected_protectedStatic.phpt +++ b/tests/classes/property_override_protected_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as protected static. echo $this->p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as protected static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_protected_public.phpt b/tests/classes/property_override_protected_public.phpt index c2db91b14c..378003ba54 100644 --- a/tests/classes/property_override_protected_public.phpt +++ b/tests/classes/property_override_protected_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as public. echo $this->p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as public. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protected_publicStatic.phpt b/tests/classes/property_override_protected_publicStatic.phpt index 8efdf5f6fd..37865cc7d4 100644 --- a/tests/classes/property_override_protected_publicStatic.phpt +++ b/tests/classes/property_override_protected_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as public static. echo $this->p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as public static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_publicStatic_private.phpt b/tests/classes/property_override_publicStatic_private.phpt index 7abe92c9ff..6fd2774c54 100644 --- a/tests/classes/property_override_publicStatic_private.phpt +++ b/tests/classes/property_override_publicStatic_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as private. echo self::$p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as private. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_publicStatic_privateStatic.phpt b/tests/classes/property_override_publicStatic_privateStatic.phpt index d41db6da38..3635b918db 100644 --- a/tests/classes/property_override_publicStatic_privateStatic.phpt +++ b/tests/classes/property_override_publicStatic_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as private static. echo self::$p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as private static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_publicStatic_protected.phpt b/tests/classes/property_override_publicStatic_protected.phpt index 884159f977..a5eaaea714 100644 --- a/tests/classes/property_override_publicStatic_protected.phpt +++ b/tests/classes/property_override_publicStatic_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as protected. echo self::$p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as protected. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_publicStatic_protectedStatic.phpt b/tests/classes/property_override_publicStatic_protectedStatic.phpt index b022ef8049..00eb647d5d 100644 --- a/tests/classes/property_override_publicStatic_protectedStatic.phpt +++ b/tests/classes/property_override_publicStatic_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as protected static. echo self::$p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as protected static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_publicStatic_public.phpt b/tests/classes/property_override_publicStatic_public.phpt index d099da0474..f6ea7643c1 100644 --- a/tests/classes/property_override_publicStatic_public.phpt +++ b/tests/classes/property_override_publicStatic_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as public. echo self::$p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as public. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_publicStatic_publicStatic.phpt b/tests/classes/property_override_publicStatic_publicStatic.phpt index 8d0f9ad079..708d7fb479 100644 --- a/tests/classes/property_override_publicStatic_publicStatic.phpt +++ b/tests/classes/property_override_publicStatic_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as public static. echo self::$p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as public static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_public_private.phpt b/tests/classes/property_override_public_private.phpt index c0f37ad95a..581d663b60 100644 --- a/tests/classes/property_override_public_private.phpt +++ b/tests/classes/property_override_public_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as private. echo $this->p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited public property as private. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_public_privateStatic.phpt b/tests/classes/property_override_public_privateStatic.phpt index 36223fd345..bacdc9ffe1 100644 --- a/tests/classes/property_override_public_privateStatic.phpt +++ b/tests/classes/property_override_public_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as private static. echo $this->p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited public property as private static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_public_protected.phpt b/tests/classes/property_override_public_protected.phpt index 68fdf8286f..aa79a53595 100644 --- a/tests/classes/property_override_public_protected.phpt +++ b/tests/classes/property_override_public_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as protected. echo $this->p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited public property as protected. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_public_protectedStatic.phpt b/tests/classes/property_override_public_protectedStatic.phpt index 77e7ebf1f8..8d78713add 100644 --- a/tests/classes/property_override_public_protectedStatic.phpt +++ b/tests/classes/property_override_public_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as protected static. echo $this->p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited public property as protected static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_public_public.phpt b/tests/classes/property_override_public_public.phpt index 3abfe24e29..83d3929702 100644 --- a/tests/classes/property_override_public_public.phpt +++ b/tests/classes/property_override_public_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as public. echo $this->p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited public property as public. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_public_publicStatic.phpt b/tests/classes/property_override_public_publicStatic.phpt index 725e947a0d..94feea8a22 100644 --- a/tests/classes/property_override_public_publicStatic.phpt +++ b/tests/classes/property_override_public_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as public static. echo $this->p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited public property as public static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt index b37b974845..6d25d71912 100644 --- a/tests/classes/property_recreate_private.phpt +++ b/tests/classes/property_recreate_private.phpt @@ -5,10 +5,10 @@ Unsetting and recreating private properties. class C { private $p = 'test'; function unsetPrivate() { - unset($this->p); + unset($this->p); } function setPrivate() { - $this->p = 'changed'; + $this->p = 'changed'; } } diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt index 3319640e3a..ddbbb71fc9 100644 --- a/tests/classes/property_recreate_protected.phpt +++ b/tests/classes/property_recreate_protected.phpt @@ -5,10 +5,10 @@ Unsetting and recreating protected properties. class C { protected $p = 'test'; function unsetProtected() { - unset($this->p); + unset($this->p); } function setProtected() { - $this->p = 'changed'; + $this->p = 'changed'; } } diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt index 71db59663f..70740d2336 100644 --- a/tests/classes/static_mix_1.phpt +++ b/tests/classes/static_mix_1.phpt @@ -19,6 +19,6 @@ pass::show(); fail::show(); echo "Done\n"; // shouldn't be displayed -?> +?> --EXPECTF-- Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt index 2aab44d586..89c26d3dd3 100644 --- a/tests/classes/static_properties_003.phpt +++ b/tests/classes/static_properties_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt index df297a71b2..68a57a8f89 100644 --- a/tests/classes/static_properties_003_error1.phpt +++ b/tests/classes/static_properties_003_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt index 4509568160..b428b4ff6e 100644 --- a/tests/classes/static_properties_003_error2.phpt +++ b/tests/classes/static_properties_003_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt index 4f4288a63c..b9423639b0 100644 --- a/tests/classes/static_properties_003_error3.phpt +++ b/tests/classes/static_properties_003_error3.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt index b43753f1c5..6501689ddb 100644 --- a/tests/classes/static_properties_003_error4.phpt +++ b/tests/classes/static_properties_003_error4.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { @@ -8,7 +8,7 @@ class C { $c = new C; echo "\n--> Access non-visible static prop like instance prop:\n"; -$c->y =& $ref; +$c->y =& $ref; ?> ==Done== --EXPECTF-- diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt index 79bbc6380b..42860c3301 100644 --- a/tests/classes/static_properties_004.phpt +++ b/tests/classes/static_properties_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Inherited static properties cannot be separated from their reference set. +Inherited static properties cannot be separated from their reference set. --FILE-- <?php class C { public static $p = 'original'; } diff --git a/tests/classes/this.phpt b/tests/classes/this.phpt index 5551e8ac88..30ea83e285 100644 --- a/tests/classes/this.phpt +++ b/tests/classes/this.phpt @@ -3,7 +3,7 @@ ZE2 $this cannot be exchanged --FILE-- <?php -/* please don't shorten this test. It shows what would happen if +/* please don't shorten this test. It shows what would happen if * the fatal error would have been a warning. */ class Foo diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt index 627cbb359c..7dda92339e 100644 --- a/tests/classes/tostring_002.phpt +++ b/tests/classes/tostring_002.phpt @@ -9,7 +9,7 @@ class Test { return "Hello\n"; } - + function __destruct() { echo $this; diff --git a/tests/classes/tostring_003.phpt b/tests/classes/tostring_003.phpt index 096a7502fe..e3bc7f8f2c 100644 --- a/tests/classes/tostring_003.phpt +++ b/tests/classes/tostring_003.phpt @@ -10,7 +10,7 @@ class Test throw new Exception("Damn!"); return "Hello\n"; } - + function __destruct() { echo $this; diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt index fffc1f8635..bfaa57e36f 100644 --- a/tests/classes/tostring_004.phpt +++ b/tests/classes/tostring_004.phpt @@ -23,7 +23,7 @@ echo "\n\nObject with bad __toString():\n"; class badToString { function __toString() { return 0; - } + } } $obj = new badToString; echo "Try 1:\n"; diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt index 8683155e35..e19a7d92d5 100644 --- a/tests/classes/unset_properties.phpt +++ b/tests/classes/unset_properties.phpt @@ -11,29 +11,29 @@ class Test protected $protectedProperty = 'protectedProperty set'; private $privateProperty = 'privateProperty set'; - + public function __get($name) { return '__get "' . $name . '"'; } - + public function __set($name, $value) { $this->$name = $value; echo '__set "' . $name . '" to "' . $value . '"'; } - + public function __isset($name) { echo '__isset "' . $name . '"'; return isset($this->$name); } - + public function getPublicProperty() { return $this->publicProperty; } - + public function setPublicProperty($publicProperty) { $this->publicProperty = $publicProperty; |