diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 17:23:43 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 19:44:14 +0200 |
commit | 17ccbeec3242b80f84fbf6b3acd58421ef003b02 (patch) | |
tree | 8fed8d7515c6603fd4a50eb0f8177883bc6da336 /ext/reflection | |
parent | cc7215f48f66982f0b7799c47d8fa4c09a32a3c7 (diff) | |
download | php-git-17ccbeec3242b80f84fbf6b3acd58421ef003b02.tar.gz |
Trim trailing whitespace in *.phpt
Diffstat (limited to 'ext/reflection')
129 files changed, 257 insertions, 257 deletions
diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt index cbd7319731..6024eaba1c 100644 --- a/ext/reflection/tests/002.phpt +++ b/ext/reflection/tests/002.phpt @@ -6,7 +6,7 @@ Reflection properties are read only class ReflectionMethodEx extends ReflectionMethod { public $foo = "xyz"; - + function __construct($c,$m) { echo __METHOD__ . "\n"; diff --git a/ext/reflection/tests/006.phpt b/ext/reflection/tests/006.phpt index 89c438765a..ab22f5c5c9 100644 --- a/ext/reflection/tests/006.phpt +++ b/ext/reflection/tests/006.phpt @@ -12,7 +12,7 @@ Class Test static public $pub = 'pub'; static protected $pro = 'pro'; static private $pri = 'pri'; - + static function testing() { $ref = new ReflectionClass('Test'); diff --git a/ext/reflection/tests/007.phpt b/ext/reflection/tests/007.phpt index 8dfc2e8bcc..2b4f3df43f 100644 --- a/ext/reflection/tests/007.phpt +++ b/ext/reflection/tests/007.phpt @@ -29,7 +29,7 @@ function test($class) { echo "Exception: " . $e->getMessage() . "\n"; } - + echo "====>newInstance(25)\n"; try { @@ -49,7 +49,7 @@ function test($class) { var_dump($e->getMessage()); } - + echo "\n"; } diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt index 2abdcdb57b..4cae4abeff 100644 --- a/ext/reflection/tests/008.phpt +++ b/ext/reflection/tests/008.phpt @@ -12,10 +12,10 @@ foreach ($a as $val) { var_dump($e->getMessage()); } } - + $a = array("", 1, ""); $b = array("", "", 1); - + foreach ($a as $key=>$val) { try { new ReflectionMethod($val, $b[$key]); @@ -26,7 +26,7 @@ foreach ($a as $key=>$val) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(20) "Invalid method name " string(21) "Invalid method name 1" string(21) "Class does not exist" diff --git a/ext/reflection/tests/009.phpt b/ext/reflection/tests/009.phpt index c6a252cfca..09df90c8c3 100644 --- a/ext/reflection/tests/009.phpt +++ b/ext/reflection/tests/009.phpt @@ -47,7 +47,7 @@ var_dump($func->getNumberOfRequiredParameters()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- /** hoho */ diff --git a/ext/reflection/tests/010.phpt b/ext/reflection/tests/010.phpt index 8f92feea09..8a08d9a788 100644 --- a/ext/reflection/tests/010.phpt +++ b/ext/reflection/tests/010.phpt @@ -15,7 +15,7 @@ class Bar extends Foo { $m = new ReflectionMethod("Bar::func"); echo $m; ?> ---EXPECTF-- +--EXPECTF-- Method [ <user, overwrites Foo, prototype Foo> public method func ] { @@ %s010.php 7 - 8 } diff --git a/ext/reflection/tests/011.phpt b/ext/reflection/tests/011.phpt index b39be37c90..e71f042f90 100644 --- a/ext/reflection/tests/011.phpt +++ b/ext/reflection/tests/011.phpt @@ -8,5 +8,5 @@ $ext = new ReflectionExtension("reflection"); $classes = $ext->getClasses(); echo $classes["ReflectionException"]->getName(); ?> ---EXPECT-- +--EXPECT-- ReflectionException diff --git a/ext/reflection/tests/012.phpt b/ext/reflection/tests/012.phpt index b8a2694004..24643450c1 100644 --- a/ext/reflection/tests/012.phpt +++ b/ext/reflection/tests/012.phpt @@ -11,6 +11,6 @@ $class = new ReflectionClass("Foo"); $props = $class->getDefaultProperties(); echo $props["test"]; ?> ---EXPECT-- +--EXPECT-- ok diff --git a/ext/reflection/tests/013.phpt b/ext/reflection/tests/013.phpt index 9ecfa8b66c..9905b95a7a 100644 --- a/ext/reflection/tests/013.phpt +++ b/ext/reflection/tests/013.phpt @@ -8,6 +8,6 @@ $ext = new ReflectionExtension("standard"); $funcs = $ext->getFunctions(); echo $funcs["sleep"]->getName(); ?> ---EXPECT-- +--EXPECT-- sleep diff --git a/ext/reflection/tests/014.phpt b/ext/reflection/tests/014.phpt index 8b5955f124..c61403872e 100644 --- a/ext/reflection/tests/014.phpt +++ b/ext/reflection/tests/014.phpt @@ -8,6 +8,6 @@ $ext = new ReflectionExtension("standard"); $consts = $ext->getConstants(); var_dump($consts["CONNECTION_NORMAL"]); ?> ---EXPECT-- +--EXPECT-- int(0) diff --git a/ext/reflection/tests/015.phpt b/ext/reflection/tests/015.phpt index b17236242a..ed6607417f 100644 --- a/ext/reflection/tests/015.phpt +++ b/ext/reflection/tests/015.phpt @@ -10,6 +10,6 @@ $ext = new ReflectionExtension("standard"); $inis = $ext->getINIEntries(); var_dump($inis["user_agent"]); ?> ---EXPECT-- +--EXPECT-- string(3) "php" diff --git a/ext/reflection/tests/016.phpt b/ext/reflection/tests/016.phpt index d289165251..e9b37c0acb 100644 --- a/ext/reflection/tests/016.phpt +++ b/ext/reflection/tests/016.phpt @@ -2,7 +2,7 @@ ReflectionExtension::getDependencies() --SKIPIF-- <?php -extension_loaded('reflection') or die('skip'); +extension_loaded('reflection') or die('skip'); if (!extension_loaded("xml")) { die('skip xml extension not available'); } @@ -13,7 +13,7 @@ $ext = new ReflectionExtension("xml"); $deps = $ext->getDependencies(); var_dump($deps); ?> ---EXPECT-- +--EXPECT-- array(1) { ["libxml"]=> string(8) "Required" diff --git a/ext/reflection/tests/018.phpt b/ext/reflection/tests/018.phpt index fbda5d62d4..40bda17544 100644 --- a/ext/reflection/tests/018.phpt +++ b/ext/reflection/tests/018.phpt @@ -6,7 +6,7 @@ Reflection::getModifierNames <?php var_dump(Reflection::getModifierNames(ReflectionMethod::IS_FINAL | ReflectionMethod::IS_PROTECTED)); ?> ---EXPECT-- +--EXPECT-- array(2) { [0]=> string(5) "final" diff --git a/ext/reflection/tests/019.phpt b/ext/reflection/tests/019.phpt index b6ac20c6bd..cd4bd3e467 100644 --- a/ext/reflection/tests/019.phpt +++ b/ext/reflection/tests/019.phpt @@ -7,5 +7,5 @@ ReflectionFunction::getExtensionName $f = new ReflectionFunction("sleep"); var_dump($f->getExtensionName()); ?> ---EXPECT-- +--EXPECT-- string(8) "standard" diff --git a/ext/reflection/tests/020.phpt b/ext/reflection/tests/020.phpt index c5b0ae5c2a..fc2d0a61a0 100644 --- a/ext/reflection/tests/020.phpt +++ b/ext/reflection/tests/020.phpt @@ -20,7 +20,7 @@ var_dump($obj->hasProperty("p2")); var_dump($obj->hasProperty("p3")); var_dump($obj->hasProperty("p4")); ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/reflection/tests/021.phpt b/ext/reflection/tests/021.phpt index 30dbb5afcb..25701eb939 100644 --- a/ext/reflection/tests/021.phpt +++ b/ext/reflection/tests/021.phpt @@ -11,6 +11,6 @@ $class = new ReflectionClass("Foo"); var_dump($class->hasConstant("c1")); var_dump($class->hasConstant("c2")); ?> ---EXPECT-- +--EXPECT-- bool(true) bool(false) diff --git a/ext/reflection/tests/022.phpt b/ext/reflection/tests/022.phpt index 50dbd6ec74..f2bdbfddd6 100644 --- a/ext/reflection/tests/022.phpt +++ b/ext/reflection/tests/022.phpt @@ -11,6 +11,6 @@ $class = new ReflectionClass("Foo"); var_dump($class->getConstant("c1")); var_dump($class->getConstant("c2")); ?> ---EXPECT-- +--EXPECT-- int(1) bool(false) diff --git a/ext/reflection/tests/023.phpt b/ext/reflection/tests/023.phpt index ab11365951..dfd43c0b8c 100644 --- a/ext/reflection/tests/023.phpt +++ b/ext/reflection/tests/023.phpt @@ -17,7 +17,7 @@ class C2 extends C1 { $class = new ReflectionClass("C2"); var_dump($class->getDefaultProperties()); ?> ---EXPECT-- +--EXPECT-- array(5) { ["p4"]=> int(4) diff --git a/ext/reflection/tests/024.phpt b/ext/reflection/tests/024.phpt index a1c2c81a93..ae900e638f 100644 --- a/ext/reflection/tests/024.phpt +++ b/ext/reflection/tests/024.phpt @@ -17,7 +17,7 @@ $x->p3 = 5; $obj = new ReflectionObject($x); echo $obj; ?> ---EXPECTF-- +--EXPECTF-- Object of class [ <user> class C1 ] { @@ %s024.php 2-6 diff --git a/ext/reflection/tests/025.phpt b/ext/reflection/tests/025.phpt index 0259d66bd3..0bcf3e0f5c 100644 --- a/ext/reflection/tests/025.phpt +++ b/ext/reflection/tests/025.phpt @@ -49,7 +49,7 @@ var_dump($func->getNumberOfRequiredParameters()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- /** hoho */ diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt index bbe5fdbaec..6fe72c3b45 100644 --- a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt @@ -7,7 +7,7 @@ TestFest PHP|Tek <?php if (!extension_loaded('reflection')) print 'skip'; ?> ---FILE-- +--FILE-- <?php $rc = new ReflectionClass("stdClass"); $rc2 = clone($rc); diff --git a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt index da276e68cf..28769da707 100644 --- a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionClass::getFileName(), ReflectionClass::getStartLine(), ReflectionClass::getEndLine() ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); @@ -14,7 +14,7 @@ var_dump($rc->getStartLine()); //Get the line number at the end of the definition of class C var_dump($rc->getEndLine()); -//Same tests as above but stdclass is internal - so all results should be false. +//Same tests as above but stdclass is internal - so all results should be false. $rc = new ReflectionClass("stdClass"); var_dump($rc->getFileName()); var_dump($rc->getStartLine()); diff --git a/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt index b42be136cd..a4e5f95564 100644 --- a/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt +++ b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionClass::getFileName(), ReflectionClass::getStartLine(), ReflectionClass::getEndLine() - bad params ---FILE-- +--FILE-- <?php Class C { } @@ -10,7 +10,7 @@ $methods = array("getFileName", "getStartLine", "getEndLine"); foreach ($methods as $method) { var_dump($rc->$method()); var_dump($rc->$method(null)); - var_dump($rc->$method('X', 0)); + var_dump($rc->$method('X', 0)); } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionClass_constructor_002.phpt b/ext/reflection/tests/ReflectionClass_constructor_002.phpt index 3685c639de..64c299592d 100644 --- a/ext/reflection/tests/ReflectionClass_constructor_002.phpt +++ b/ext/reflection/tests/ReflectionClass_constructor_002.phpt @@ -5,43 +5,43 @@ ReflectionClass::__constructor() - bad arguments try { var_dump(new ReflectionClass()); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(null)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(true)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(1)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(array(1,2,3))); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass("stdClass", 1)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass("X")); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } ?> diff --git a/ext/reflection/tests/ReflectionClass_export_basic1.phpt b/ext/reflection/tests/ReflectionClass_export_basic1.phpt index 8729731f56..83c514adab 100644 --- a/ext/reflection/tests/ReflectionClass_export_basic1.phpt +++ b/ext/reflection/tests/ReflectionClass_export_basic1.phpt @@ -2,7 +2,7 @@ ReflectionClass::export() - various parameters --FILE-- <?php -Class A { +Class A { public function privf(Exception $a) {} public function pubf(A $a, $b, diff --git a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt index c572796ae8..5db9d8f3d3 100644 --- a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt @@ -48,7 +48,7 @@ class D1 extends C { class D2 extends C { } -$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', +$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y'); foreach ($classes as $class) { @@ -59,9 +59,9 @@ foreach ($classes as $class) { } else { echo "No constructor for $class\n"; } - -} - + +} + ?> --EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d diff --git a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt index e19db81188..9ca0ae52f7 100644 --- a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionClass::getDefaultProperties(), ReflectionClass::getStaticProperties() +ReflectionClass::getDefaultProperties(), ReflectionClass::getStaticProperties() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> @@ -11,15 +11,15 @@ class A { static public $statPubC = "stat pubC in A"; static protected $statProtC = "stat protC in A"; static private $statPrivC = "stat privC in A"; - + static public $statPubA = "stat pubA in A"; static protected $statProtA = "stat protA in A"; static private $statPrivA = "stat privA in A"; - + public $pubC = "pubC in A"; protected $protC = "protC in A"; private $privC = "privC in A"; - + public $pubA = "pubA in A"; protected $protA = "protA in A"; private $privA = "privA in A"; @@ -32,22 +32,22 @@ class B extends A { static public $statPubB = "stat pubB in B"; static protected $statProtB = "stat protB in B"; - static private $statPrivB = "stat privB in B"; - + static private $statPrivB = "stat privB in B"; + public $pubC = "pubC in B"; protected $protC = "protC in B"; private $privC = "privC in B"; public $pubB = "pubB in B"; protected $protB = "protB in B"; - private $privB = "privB in B"; + private $privB = "privB in B"; } class C extends B { static public $statPubC = "stat pubC in C"; static protected $statProtC = "stat protC in C"; static private $statPrivC = "stat privC in C"; - + public $pubC = "pubC in C"; protected $protC = "protC in C"; private $privC = "privC in C"; @@ -60,7 +60,7 @@ class X { public $pubC = "pubC in X"; protected $protC = "protC in X"; - private $privC = "privC in X"; + private $privC = "privC in X"; } $classes = array('A', 'B', 'C', 'X'); @@ -68,7 +68,7 @@ foreach ($classes as $class) { $rc = new ReflectionClass($class); echo "\n\n---- Static properties in $class ----\n"; print_r($rc->getStaticProperties()); - echo "\n\n---- Default properties in $class ----\n"; + echo "\n\n---- Default properties in $class ----\n"; print_r($rc->getDefaultProperties()); } diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt index 624829f014..31e0e8e58b 100644 --- a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt @@ -11,8 +11,8 @@ opcache.save_comments=1 My -Doc - * Comment +Doc + * Comment for A * */ @@ -49,8 +49,8 @@ final class G extends C implements I {} {} $classes = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'I'); foreach ($classes as $class) { echo "\n\n---> Doc comment for class $class:\n"; - $rc = new ReflectionClass($class); - var_dump($rc->getDocComment()); + $rc = new ReflectionClass($class); + var_dump($rc->getDocComment()); } @@ -63,8 +63,8 @@ string(%d) "/** My -Doc - * Comment +Doc + * Comment for A * */" diff --git a/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt index 998355cc7c..4f78343081 100644 --- a/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt +++ b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt @@ -7,7 +7,7 @@ Rein Velt <rein@velt.org> <?php class myClass - { + { public $varX; public $varY; } diff --git a/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt index 5409504716..f3697792db 100644 --- a/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt +++ b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt @@ -7,7 +7,7 @@ Rein Velt <rein@velt.org> <?php class myClass - { + { public $varX; public $varY; } diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt index 42136003e7..a622e87d2f 100644 --- a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt @@ -28,7 +28,7 @@ class C5 extends C4 implements I7 {} class C6 implements I1, I2, I3, I4, I5, I6, I7 {} -$classes = array( 'A0', 'A1', 'B0', 'B1', +$classes = array( 'A0', 'A1', 'B0', 'B1', 'I0', 'I1', 'I2', 'I3', 'I4', 'I5', 'I6', 'I7', 'C0', 'C1', 'C2', 'C3', 'C4', 'C5', 'C6' ); diff --git a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt index 780b558cc7..59887991ec 100644 --- a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt @@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net> <?php class pubf { public function f() {} - static public function s() {} + static public function s() {} } class subpubf extends pubf { } class protf { protected function f() {} - static protected function s() {} + static protected function s() {} } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; @@ -34,14 +34,14 @@ foreach($classes as $class) { echo " --> Check for f(): "; var_dump($rc->getMethod("f")); echo " --> Check for s(): "; - var_dump($rc->getMethod("s")); + var_dump($rc->getMethod("s")); echo " --> Check for F(): "; - var_dump($rc->getMethod("F")); + var_dump($rc->getMethod("F")); echo " --> Check for doesntExist(): "; try { var_dump($rc->getMethod("doesntExist")); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } } ?> diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt index 2baabdedad..f70e779e9f 100644 --- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt @@ -14,42 +14,42 @@ echo "Check invalid params:\n"; try { var_dump($rc->getMethod()); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod("f", "f")); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(null)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(1)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(1.5)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(true)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(array(1,2,3))); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(new C)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } diff --git a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt index 7d4b6774c2..dca9adb56d 100644 --- a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt @@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net> <?php class pubf { public function f() {} - static public function s() {} + static public function s() {} } class subpubf extends pubf { } class protf { protected function f() {} - static protected function s() {} + static protected function s() {} } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; diff --git a/ext/reflection/tests/ReflectionClass_getName_basic.phpt b/ext/reflection/tests/ReflectionClass_getName_basic.phpt index 158413f158..b80e24853a 100644 --- a/ext/reflection/tests/ReflectionClass_getName_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getName_basic.phpt @@ -18,7 +18,7 @@ $r3 = new ReflectionClass("TrickClass"); var_dump($r1->getName(), $r2->getName(), $r3->getName()); -?> +?> --EXPECTF-- string(8) "stdClass" string(8) "stdClass" diff --git a/ext/reflection/tests/ReflectionClass_getName_error.phpt b/ext/reflection/tests/ReflectionClass_getName_error.phpt index 06cc4155be..145704e7bc 100644 --- a/ext/reflection/tests/ReflectionClass_getName_error.phpt +++ b/ext/reflection/tests/ReflectionClass_getName_error.phpt @@ -7,7 +7,7 @@ $r1 = new ReflectionClass("stdClass"); var_dump($r1->getName('X')); var_dump($r1->getName('X', true)); -?> +?> --EXPECTF-- Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d NULL diff --git a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt index ed0b160b93..3554af3890 100644 --- a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt @@ -14,7 +14,7 @@ class subpubf extends pubf { class protf { protected $a; - static protected $s; + static protected $s; } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; diff --git a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt index fca68ed30f..830608e0ca 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; @@ -35,25 +35,25 @@ foreach($classes as $class) { echo " --> Check for s: "; var_dump($rc->getProperty("s")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { echo " --> Check for a: "; var_dump($rc->getProperty("a")); } catch (exception $e) { - echo $e->getMessage() . "\n"; - } + echo $e->getMessage() . "\n"; + } try { echo " --> Check for A: "; var_dump($rc->getProperty("A")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { echo " --> Check for doesntExist: "; var_dump($rc->getProperty("doesntExist")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } } diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt index be7bb53bc8..cf4aca51ea 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt @@ -14,42 +14,42 @@ echo "Check invalid params:\n"; try { var_dump($rc->getProperty()); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty("a", "a")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(null)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(1)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(1.5)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(true)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(array(1,2,3))); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(new C)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt index 16c0c306ba..98b824b747 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt @@ -9,10 +9,10 @@ class A { static public $pubC = "pubC in A"; static protected $protC = "protC in A"; static private $privC = "privC in A"; - + static public $pubA = "pubA in A"; static protected $protA = "protA in A"; - static private $privA = "privA in A"; + static private $privA = "privA in A"; } class B extends A { @@ -22,7 +22,7 @@ class B extends A { static public $pubB = "pubB in B"; static protected $protB = "protB in B"; - static private $privB = "privB in B"; + static private $privB = "privB in B"; } class C extends B { @@ -34,7 +34,7 @@ class C extends B { class X { static public $pubC = "pubC in X"; static protected $protC = "protC in X"; - static private $privC = "privC in X"; + static private $privC = "privC in X"; } $myC = new C; @@ -52,10 +52,10 @@ function showInfo($name) { try { var_dump($rp); var_dump($rp->getValue($myC)); - } catch (Exception $e) { + } catch (Exception $e) { echo $e->getMessage() . "\n"; return; - } + } } diff --git a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt index 89335f42c4..d547f50539 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt @@ -9,10 +9,10 @@ class A { public $pubC = "pubC in A"; protected $protC = "protC in A"; private $privC = "privC in A"; - + public $pubA = "pubA in A"; protected $protA = "protA in A"; - private $privA = "privA in A"; + private $privA = "privA in A"; } class B extends A { @@ -22,7 +22,7 @@ class B extends A { public $pubB = "pubB in B"; protected $protB = "protB in B"; - private $privB = "privB in B"; + private $privB = "privB in B"; } class C extends B { @@ -34,7 +34,7 @@ class C extends B { class X { public $pubC = "pubC in X"; protected $protC = "protC in X"; - private $privC = "privC in X"; + private $privC = "privC in X"; } $myC = new C; @@ -52,10 +52,10 @@ function showInfo($name) { try { var_dump($rp); var_dump($rp->getValue($myC)); - } catch (Exception $e) { + } catch (Exception $e) { echo $e->getMessage() . "\n"; return; - } + } } diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt index ab8afb8cb9..365ec89ff1 100644 --- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionClass::getStaticPropertyValue() +ReflectionClass::getStaticPropertyValue() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> @@ -42,7 +42,7 @@ try { try { var_dump($rcA->getStaticPropertyValue("privateOverridden")); - echo "you should not see this"; + echo "you should not see this"; } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt index 6e6d4341c8..b4f4a1a88a 100644 --- a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt @@ -22,7 +22,7 @@ echo "Check absent constant: "; var_dump($rc->hasConstant("doesntExist")); -$rd = new ReflectionClass("D"); +$rd = new ReflectionClass("D"); echo "Check inherited constant: "; var_dump($rd->hasConstant("myConst")); echo "Check absent constant: "; diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt index 0ff2523d6f..7f5d4ca2c8 100644 --- a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt @@ -3,7 +3,7 @@ ReflectionClass::hasConstant() --CREDITS-- Marc Veldman <marc@ibuildings.nl> #testfest roosendaal on 2008-05-10 ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt index 81614bd9f8..b7519e551b 100644 --- a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt @@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net> <?php class pubf { public function f() {} - static public function s() {} + static public function s() {} } class subpubf extends pubf { } class protf { protected function f() {} - static protected function s() {} + static protected function s() {} } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; @@ -34,9 +34,9 @@ foreach($classes as $class) { echo " --> Check for f(): "; var_dump($rc->hasMethod("f")); echo " --> Check for s(): "; - var_dump($rc->hasMethod("s")); + var_dump($rc->hasMethod("s")); echo " --> Check for F(): "; - var_dump($rc->hasMethod("F")); + var_dump($rc->hasMethod("F")); echo " --> Check for doesntExist(): "; var_dump($rc->hasMethod("doesntExist")); } diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt index fa4ee482b2..025a11d211 100644 --- a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt @@ -3,7 +3,7 @@ ReflectionClass::hasMethod() --CREDITS-- Marc Veldman <marc@ibuildings.nl> #testfest roosendaal on 2008-05-10 ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt index 88c4cd509a..cd4a4e048d 100644 --- a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt @@ -26,17 +26,17 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; $rc = new ReflectionClass($class); echo " --> Check for s: "; - var_dump($rc->hasProperty("s")); + var_dump($rc->hasProperty("s")); echo " --> Check for a: "; var_dump($rc->hasProperty("a")); echo " --> Check for A: "; - var_dump($rc->hasProperty("A")); + var_dump($rc->hasProperty("A")); echo " --> Check for doesntExist: "; var_dump($rc->hasProperty("doesntExist")); } diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt index d6dda7c2a3..c022caba2f 100644 --- a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt @@ -3,7 +3,7 @@ ReflectionClass::hasProperty() --CREDITS-- Marc Veldman <marc@ibuildings.nl> #testfest roosendaal on 2008-05-10 ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); diff --git a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt index 9c2fdedddb..91398867ec 100644 --- a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt +++ b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt @@ -12,7 +12,7 @@ class B extends A {} interface I2 extends I1 {} class C implements I2 {} -$classNames = array('A', 'B', 'C', 'I1', 'I2'); +$classNames = array('A', 'B', 'C', 'I1', 'I2'); foreach ($classNames as $className) { $rcs[$className] = new ReflectionClass($className); @@ -26,7 +26,7 @@ foreach ($rcs as $childName => $child) { var_dump($child->implementsInterface($parent)); } catch (Exception $e) { echo $e->getMessage() . "\n"; - } + } echo " - Using string argument: "; try { var_dump($child->implementsInterface($parentName)); diff --git a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt index 2da09449ff..846ee9607b 100644 --- a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt @@ -22,7 +22,7 @@ foreach ($classes as $class) { foreach ($instances as $name => $instance) { echo "is $name a $class? "; - var_dump($rc->isInstance($instance)); + var_dump($rc->isInstance($instance)); } } diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt index 6ebcfa99a9..0d48513299 100644 --- a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt @@ -27,7 +27,7 @@ $classes = array("C", "iface", "ifaceImpl", "abstractClass", "D"); foreach($classes as $class ) { $reflectionClass = new ReflectionClass($class); echo "Is $class instantiable? "; - var_dump($reflectionClass->IsInstantiable()); + var_dump($reflectionClass->IsInstantiable()); } diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt index e334a90a72..1378edd3d2 100644 --- a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt @@ -36,7 +36,7 @@ $classes = array("noCtor", "publicCtorNew", "protectedCtorNew", "privateCtorNew" foreach($classes as $class ) { $reflectionClass = new ReflectionClass($class); echo "Is $class instantiable? "; - var_dump($reflectionClass->IsInstantiable()); + var_dump($reflectionClass->IsInstantiable()); } ?> diff --git a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt index 2eaacb67f8..ca21cf77ef 100644 --- a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionClass("ReflectionProperty"); $r4 = new ReflectionClass("Exception"); $r5 = new ReflectionClass("C"); -var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), +var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), $r4->isInternal(), $r5->isInternal()); ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt index 42dc647a02..8a0098ad8d 100644 --- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt +++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt @@ -26,7 +26,7 @@ Class ExtendsIteratorAggregateImpl extends IterarorAggregateImpl { Class A { } -$classes = array('Traversable', 'Iterator', 'IteratorAggregate', 'ExtendsIterator', 'ExtendsIteratorAggregate', +$classes = array('Traversable', 'Iterator', 'IteratorAggregate', 'ExtendsIterator', 'ExtendsIteratorAggregate', 'IteratorImpl', 'IterarorAggregateImpl', 'ExtendsIteratorImpl', 'ExtendsIteratorAggregateImpl', 'A'); foreach($classes as $class) { diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt index 94fcf00ece..b175d9656c 100644 --- a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt @@ -9,7 +9,7 @@ class C extends B {} interface I {} class X implements I {} -$classNames = array('A', 'B', 'C', 'I', 'X'); +$classNames = array('A', 'B', 'C', 'I', 'X'); foreach ($classNames as $className) { $rcs[$className] = new ReflectionClass($className); @@ -21,7 +21,7 @@ foreach ($rcs as $childName => $child) { echo " - Using object argument: "; var_dump($child->isSubclassOf($parent)); echo " - Using string argument: "; - var_dump($child->isSubclassOf($parentName)); + var_dump($child->isSubclassOf($parentName)); } } ?> diff --git a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt index af43fcefa4..f3a84a9313 100644 --- a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionClass("ReflectionProperty"); $r4 = new ReflectionClass("Exception"); $r5 = new ReflectionClass("C"); -var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), +var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), $r4->isUserDefined(), $r5->isUserDefined()); ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt index 3ad654dd84..068710311d 100644 --- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt +++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt @@ -7,8 +7,8 @@ Steve Seear <stevseea@php.net> <?php class A { public function A() { - echo "In constructor of class A\n"; - } + echo "In constructor of class A\n"; + } } class B { @@ -19,16 +19,16 @@ class B { class C { protected function __construct() { - echo "In constructor of class C\n"; + echo "In constructor of class C\n"; } } class D { private function __construct() { - echo "In constructor of class D\n"; + echo "In constructor of class D\n"; } } -class E { +class E { } diff --git a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt index e29cc8734f..c91d2ee958 100644 --- a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt +++ b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt @@ -7,8 +7,8 @@ Steve Seear <stevseea@php.net> <?php class A { public function A() { - echo "In constructor of class A\n"; - } + echo "In constructor of class A\n"; + } } class B { @@ -19,16 +19,16 @@ class B { class C { protected function __construct() { - echo "In constructor of class C\n"; + echo "In constructor of class C\n"; } } class D { private function __construct() { - echo "In constructor of class D\n"; + echo "In constructor of class D\n"; } } -class E { +class E { } diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt index 0004f3ff5a..bfefce369e 100644 --- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt +++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionClass::setStaticPropertyValue() +ReflectionClass::setStaticPropertyValue() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> @@ -43,7 +43,7 @@ try { try { var_dump($rcA->setStaticPropertyValue("privateOverridden", "new value 9")); - echo "you should not see this"; + echo "you should not see this"; } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt b/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt index e32790c923..682a0f5e32 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt @@ -4,7 +4,7 @@ Reflection::getClosureScopeClass() <?php if (!extension_loaded('reflection')) print 'skip'; ?> ---FILE-- +--FILE-- <?php $closure = function($param) { return "this is a closure"; }; $rf = new ReflectionFunction($closure); diff --git a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt index 4795025798..90a07b7eb9 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt @@ -4,7 +4,7 @@ Reflection::getClosureThis() <?php if (!extension_loaded('reflection')) print 'skip'; ?> ---FILE-- +--FILE-- <?php $closure = function($param) { return "this is a closure"; }; $rf = new ReflectionFunction($closure); diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt index 786be050c1..22f463b9af 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ReflectionFunction::getClosure() function : basic functionality +Test ReflectionFunction::getClosure() function : basic functionality --FILE-- <?php /* Prototype : public mixed ReflectionFunction::getClosure() - * Description: Returns a dynamically created closure for the function + * Description: Returns a dynamically created closure for the function * Source code: ext/reflection/php_reflection.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ReflectionFunction::getClosure() : basic functionality ***\n"; diff --git a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt index df101fcd3e..19c9578980 100644 --- a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt @@ -7,7 +7,7 @@ TestFest PHP|Tek <?php if (!extension_loaded('reflection')) print 'skip'; ?> ---FILE-- +--FILE-- <?php $closure = function($param) { return "this is a closure"; }; $rc = new ReflectionFunction($closure); diff --git a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt index 7b37b939e4..5643b2933f 100644 --- a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt @@ -3,7 +3,7 @@ ReflectionFunction::isDeprecated --CREDITS-- Stefan Koopmanschap <stefan@phpgg.nl> TestFest PHP|Tek ---FILE-- +--FILE-- <?php // We currently don't have any deprecated functions :/ $rc = new ReflectionFunction('var_dump'); diff --git a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt index 30189cf4de..fe1af222ea 100644 --- a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt @@ -9,7 +9,7 @@ if (!extension_loaded('reflection')) print 'skip'; ?> --INI-- disable_functions=is_file ---FILE-- +--FILE-- <?php $rc = new ReflectionFunction('is_file'); var_dump($rc->isDisabled()); diff --git a/ext/reflection/tests/ReflectionMethod_basic1.phpt b/ext/reflection/tests/ReflectionMethod_basic1.phpt index 75ab957690..d403d2d2be 100644 --- a/ext/reflection/tests/ReflectionMethod_basic1.phpt +++ b/ext/reflection/tests/ReflectionMethod_basic1.phpt @@ -31,17 +31,17 @@ class TestClass public function foo() { echo "Called foo()\n"; } - + static function stat() { echo "Called stat()\n"; } - + private function priv() { echo "Called priv()\n"; } - + protected function prot() {} - + public function __destruct() {} } diff --git a/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt b/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt index 536f40c2e1..561a9aed31 100644 --- a/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt +++ b/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt @@ -4,7 +4,7 @@ Reflection::getClosureThis() <?php if (!extension_loaded('reflection')) print 'skip'; ?> ---FILE-- +--FILE-- <?php class StaticExample { diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt index c97c41c738..a755b4d548 100644 --- a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ReflectionMethod::getClosure() function : basic functionality +Test ReflectionMethod::getClosure() function : basic functionality --FILE-- <?php /* Prototype : public mixed ReflectionFunction::getClosure() - * Description: Returns a dynamically created closure for the method + * Description: Returns a dynamically created closure for the method * Source code: ext/reflection/php_reflection.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ReflectionMethod::getClosure() : basic functionality ***\n"; diff --git a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt index 6afc70032a..8e34d61731 100644 --- a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt @@ -17,7 +17,7 @@ var_dump($methodInfo->getDeclaringClass()); $methodInfo = new ReflectionMethod('B', 'bar'); var_dump($methodInfo->getDeclaringClass()); -?> +?> --EXPECTF-- object(ReflectionClass)#%d (1) { ["name"]=> diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt index e79092421d..2544b0e7ec 100644 --- a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt @@ -26,7 +26,7 @@ class A { * My Doc Comment for A::finalStatPubf */ final static public function finalStatPubf() {} - + } @@ -44,7 +44,7 @@ class B extends A { private function privf() {} - /** My Doc Comment for B::protStatf + /** My Doc Comment for B::protStatf @@ -100,7 +100,7 @@ string(%d) "/** * ---> Doc comment for B::protStatf(): -string(%d) "/** My Doc Comment for B::protStatf +string(%d) "/** My Doc Comment for B::protStatf diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt index eec5a3e618..dbd128e18c 100644 --- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt +++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt @@ -19,7 +19,7 @@ $methodWithArgs = new ReflectionMethod('TestClass', 'methodWithArgs'); $testClassInstance = new TestClass(); echo "\nMethod with args:\n"; -var_dump($methodWithArgs->invokeArgs($testClassInstance, array())); +var_dump($methodWithArgs->invokeArgs($testClassInstance, array())); ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt index 00214dcdc5..82c68bbabe 100644 --- a/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() - basic function ---FILE-- +--FILE-- <?php $rc = new ReflectionObject(new C); var_dump($rc->getFileName()); diff --git a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt index d30e677178..70ad24297d 100644 --- a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt +++ b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt @@ -1,6 +1,6 @@ --TEST-- -ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() -invalid aparams ---FILE-- +ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() -invalid aparams +--FILE-- <?php Class C { } @@ -10,7 +10,7 @@ $methods = array("getFileName", "getStartLine", "getEndLine"); foreach ($methods as $method) { var_dump($rc->$method()); var_dump($rc->$method(null)); - var_dump($rc->$method('X', 0)); + var_dump($rc->$method('X', 0)); } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionObject_export_basic3.phpt b/ext/reflection/tests/ReflectionObject_export_basic3.phpt index 7c1da34c93..dfd3f2e803 100644 --- a/ext/reflection/tests/ReflectionObject_export_basic3.phpt +++ b/ext/reflection/tests/ReflectionObject_export_basic3.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionObject::export() - ensure dynamic property with same name as inherited private property is shown. +ReflectionObject::export() - ensure dynamic property with same name as inherited private property is shown. --FILE-- <?php class C { diff --git a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt index 6479ec90ed..de7998698b 100644 --- a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionObject::getConstants() - basic function test +ReflectionObject::getConstants() - basic function test --FILE-- <?php class C { diff --git a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt index 2fb43562bb..aecc9b97d2 100644 --- a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt @@ -48,7 +48,7 @@ class D1 extends C { class D2 extends C { } -$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', +$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y'); foreach ($classes as $class) { @@ -59,9 +59,9 @@ foreach ($classes as $class) { } else { echo "No constructor for $class\n"; } - -} - + +} + ?> --EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt index 0d88c84398..9f50209b6b 100644 --- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt +++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt @@ -3,7 +3,7 @@ ReflectionObject::getName - forbid static invocation --FILE-- <?php ReflectionObject::getName(); -?> +?> --EXPECTF-- Fatal error: Uncaught Error: Non-static method ReflectionClass::getName() cannot be called statically in %s:2 Stack trace: diff --git a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt index ef605aad84..8437ac8e11 100644 --- a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt @@ -16,7 +16,7 @@ foreach ($classes as $class) { $ro = new ReflectionObject(new $class); foreach ($instances as $name => $instance) { echo "is $name a $class? "; - var_dump($ro->isInstance($instance)); + var_dump($ro->isInstance($instance)); } } diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt index 4b8a6ec221..478ac77633 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt @@ -27,7 +27,7 @@ $classes = array("C", "ifaceImpl", "D"); foreach($classes as $class ) { $ro = new ReflectionObject(new $class); echo "Is $class instantiable? "; - var_dump($ro->IsInstantiable()); + var_dump($ro->IsInstantiable()); } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt index c77c039d4d..f6d4c9d3d2 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt @@ -6,7 +6,7 @@ class privateCtorOld { private function privateCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } $reflectionObject = privateCtorOld::reflectionObjectFactory(); diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt index 1e5be59299..675bbdde8d 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt @@ -6,49 +6,49 @@ ReflectionObject::IsInstantiable() - variation - constructors class noCtor { public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class publicCtorNew { public function __construct() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class protectedCtorNew { protected function __construct() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class privateCtorNew { private function __construct() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class publicCtorOld { public function publicCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class protectedCtorOld { protected function protectedCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class privateCtorOld { private function privateCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } @@ -57,7 +57,7 @@ $reflectionObjects = array( publicCtorNew::reflectionObjectFactory(), protectedCtorNew::reflectionObjectFactory(), privateCtorNew::reflectionObjectFactory(), - publicCtorOld::reflectionObjectFactory(), + publicCtorOld::reflectionObjectFactory(), protectedCtorOld::reflectionObjectFactory(), privateCtorOld::reflectionObjectFactory() ); @@ -65,7 +65,7 @@ $reflectionObjects = array( foreach($reflectionObjects as $reflectionObject ) { $name = $reflectionObject->getName(); echo "Is $name instantiable? "; - var_dump($reflectionObject->IsInstantiable()); + var_dump($reflectionObject->IsInstantiable()); } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt index 066bca70ee..633812856f 100644 --- a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionObject(new ReflectionProperty('Exception', 'message')); $r4 = new ReflectionObject(new Exception); $r5 = new ReflectionObject(new C); -var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), +var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), $r4->isInternal(), $r5->isInternal()); ?> diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt index e89066a7ea..b3ec076fb6 100644 --- a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt @@ -9,7 +9,7 @@ class C extends B {} interface I {} class X implements I {} -$classNames = array('A', 'B', 'C', 'I', 'X'); +$classNames = array('A', 'B', 'C', 'I', 'X'); //Create ReflectionClasses foreach ($classNames as $className) { @@ -33,7 +33,7 @@ foreach ($ros as $childName => $child) { var_dump($child->isSubclassOf($ros[$parentName])); } echo " - Using string argument: "; - var_dump($child->isSubclassOf($parentName)); + var_dump($child->isSubclassOf($parentName)); } } ?> diff --git a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt index 4cb08fcb67..bb9e0e8bd1 100644 --- a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionObject(new ReflectionProperty('Exception', 'message')); $r4 = new ReflectionObject(new Exception); $r5 = new ReflectionObject(new C); -var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), +var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), $r4->isUserDefined(), $r5->isUserDefined()); ?> diff --git a/ext/reflection/tests/ReflectionParameter_001.phpt b/ext/reflection/tests/ReflectionParameter_001.phpt index dae3ac7235..71dc69ca4e 100644 --- a/ext/reflection/tests/ReflectionParameter_001.phpt +++ b/ext/reflection/tests/ReflectionParameter_001.phpt @@ -9,11 +9,11 @@ class ReflectTestClass { public static function twoArgFunction($theIncrement, $anotherParam) { return ++$theIncrement; } - + public function oneArgNonStatic($theParam) { $theParam--; } - + public function noArgs() { echo "No arg function\n"; } diff --git a/ext/reflection/tests/ReflectionParameter_002.phpt b/ext/reflection/tests/ReflectionParameter_002.phpt index 3b7df6f95b..349e6f0ca9 100644 --- a/ext/reflection/tests/ReflectionParameter_002.phpt +++ b/ext/reflection/tests/ReflectionParameter_002.phpt @@ -9,7 +9,7 @@ class ReflectTestClass { public static function staticMethod(&$paramOne, $anotherParam) { return ++$theIncrement; } - + public function instanceMethod($firstParam, &$secondParam) { $firstParam = "Hello\n"; } diff --git a/ext/reflection/tests/ReflectionParameter_003.phpt b/ext/reflection/tests/ReflectionParameter_003.phpt index f7ced9ad00..cc092bffcc 100644 --- a/ext/reflection/tests/ReflectionParameter_003.phpt +++ b/ext/reflection/tests/ReflectionParameter_003.phpt @@ -7,13 +7,13 @@ Steve Seear <stevseea@php.net> <?php class ReflectTestClass { - public static function staticMethod($paramOne, $anotherParam = "bob", + public static function staticMethod($paramOne, $anotherParam = "bob", &$thirdParam = "jack", $arrayParam = array('one')) { echo "hello from test\n"; echo "third is $thirdParam\n"; return ++$theIncrement; } - + } $jane = "jane"; @@ -36,7 +36,7 @@ foreach($refParameters as $parameter) { } else { echo "this parameter has no default value\n"; } - + /* $val = 0; try { @@ -47,7 +47,7 @@ foreach($refParameters as $parameter) { echo "\n"; } */ - + echo "\n"; } diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt index 6c154558e9..1d7b79a68e 100644 --- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt +++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionParameter::__construct(): Invalid method as constructor ---FILE-- +--FILE-- <?php // Invalid class name diff --git a/ext/reflection/tests/ReflectionProperty_basic2.phpt b/ext/reflection/tests/ReflectionProperty_basic2.phpt index 62938df100..0491073ace 100644 --- a/ext/reflection/tests/ReflectionProperty_basic2.phpt +++ b/ext/reflection/tests/ReflectionProperty_basic2.phpt @@ -35,7 +35,7 @@ reflectProperty("TestClass", "stat"); reflectProperty("TestClass", "prot"); reflectProperty("TestClass", "priv"); -?> +?> --EXPECTF-- ********************************** Reflecting on property TestClass::pub diff --git a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt index d61480377c..70dcfaf895 100644 --- a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt +++ b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt @@ -5,14 +5,14 @@ ReflectionProperty::__construct(): ensure inherited private props can't be acces class C { private $p = 1; - + static function testFromC() { try { $rp = new ReflectionProperty("D", "p"); var_dump($rp); } catch (Exception $e) { echo $e->getMessage(); - } + } } } @@ -23,7 +23,7 @@ class D extends C{ var_dump($rp); } catch (Exception $e) { echo $e->getMessage(); - } + } } } diff --git a/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt index bf525e1c4f..c7c9366471 100644 --- a/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt +++ b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt @@ -16,7 +16,7 @@ var_dump($propInfo->getDeclaringClass()); echo "Wrong number of params:\n"; $propInfo->getDeclaringClass(1); -?> +?> --EXPECTF-- object(ReflectionClass)#%d (1) { ["name"]=> diff --git a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt index fe888a83bc..6d7ddbe834 100644 --- a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt +++ b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt @@ -8,13 +8,13 @@ Steve Seear <stevseea@php.net> function reflectProperty($class, $property) { $propInfo = new ReflectionProperty($class, $property); - + echo "**********************************\n"; echo "Reflecting on property $class::$property\n\n"; - + echo "getModifiers():\n"; var_dump($propInfo->getModifiers()); - + echo "\n**********************************\n"; } @@ -23,7 +23,7 @@ class TestClass public $pub; static public $stat = "static property"; /** - * This property has a comment. + * This property has a comment. */ protected $prot = 4; private $priv = "keepOut"; diff --git a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt index 22ee117cc8..2aa630d9d0 100644 --- a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt +++ b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt @@ -28,7 +28,7 @@ echo "Wrong number of params:\n"; $propInfo = new ReflectionProperty('TestClass', 'pub'); $propInfo->isDefault(1); -?> +?> --EXPECTF-- ********************************** Reflecting on property TestClass::pub diff --git a/ext/reflection/tests/bug29268.phpt b/ext/reflection/tests/bug29268.phpt index 0ab7e332b2..9166bd3aa9 100644 --- a/ext/reflection/tests/bug29268.phpt +++ b/ext/reflection/tests/bug29268.phpt @@ -13,7 +13,7 @@ class B{ } $ref = new reflectionMethod('B','doit'); -$parameters = $ref->getParameters(); +$parameters = $ref->getParameters(); foreach($parameters as $parameter) { $class = $parameter->getClass(); diff --git a/ext/reflection/tests/bug29523.phpt b/ext/reflection/tests/bug29523.phpt index e74403c6a6..fafc93ef40 100644 --- a/ext/reflection/tests/bug29523.phpt +++ b/ext/reflection/tests/bug29523.phpt @@ -11,7 +11,7 @@ function optionalTest(TestClass $a, TestClass $b, $c = 3) { } -$function = new ReflectionFunction('optionalTest'); +$function = new ReflectionFunction('optionalTest'); $numberOfNotOptionalParameters = 0; $numberOfOptionalParameters = 0; foreach($function->getParameters() as $parameter) diff --git a/ext/reflection/tests/bug36337.phpt b/ext/reflection/tests/bug36337.phpt index 369d5bef1a..ebe64431a7 100644 --- a/ext/reflection/tests/bug36337.phpt +++ b/ext/reflection/tests/bug36337.phpt @@ -23,6 +23,6 @@ $x = new myEnum(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) Done diff --git a/ext/reflection/tests/bug36434.phpt b/ext/reflection/tests/bug36434.phpt index 9598a40b7b..502ac741a9 100644 --- a/ext/reflection/tests/bug36434.phpt +++ b/ext/reflection/tests/bug36434.phpt @@ -26,6 +26,6 @@ foreach ($r->GetProperties() as $p) } ?> ---EXPECT-- +--EXPECT-- bar foo ancester ancester diff --git a/ext/reflection/tests/bug37964.phpt b/ext/reflection/tests/bug37964.phpt index 935119314f..f3c161da8d 100644 --- a/ext/reflection/tests/bug37964.phpt +++ b/ext/reflection/tests/bug37964.phpt @@ -5,7 +5,7 @@ Reflection Bug #37964 (Reflection shows private methods of parent class) abstract class foobar { private function test2() { - } + } } class foo extends foobar { private $foo = 1; diff --git a/ext/reflection/tests/bug38194.phpt b/ext/reflection/tests/bug38194.phpt index 1430ba45ae..dfbfb67147 100644 --- a/ext/reflection/tests/bug38194.phpt +++ b/ext/reflection/tests/bug38194.phpt @@ -3,7 +3,7 @@ Reflection Bug #38194 (ReflectionClass::isSubclassOf() returns TRUE for the clas --FILE-- <?php class ObjectOne { } - + $objectClass = new ReflectionClass('ObjectOne'); var_dump($objectClass->isSubclassOf($objectClass)); ?> diff --git a/ext/reflection/tests/bug38217.phpt b/ext/reflection/tests/bug38217.phpt index b02c8210e5..46f2dc3e0e 100644 --- a/ext/reflection/tests/bug38217.phpt +++ b/ext/reflection/tests/bug38217.phpt @@ -28,7 +28,7 @@ var_dump($class->newInstanceArgs(array('test'))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(ObjectOne)#%d (0) { } Exception: Too few arguments to function ObjectTwo::__construct(), 0 passed and exactly 1 expected diff --git a/ext/reflection/tests/bug38653.phpt b/ext/reflection/tests/bug38653.phpt index 68781d2aba..b30635b779 100644 --- a/ext/reflection/tests/bug38653.phpt +++ b/ext/reflection/tests/bug38653.phpt @@ -20,7 +20,7 @@ var_dump($foo->getConstant("no such const")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(10) string(0) "" string(4) "test" diff --git a/ext/reflection/tests/bug39001.phpt b/ext/reflection/tests/bug39001.phpt index 1ed675f029..cf6e99b093 100644 --- a/ext/reflection/tests/bug39001.phpt +++ b/ext/reflection/tests/bug39001.phpt @@ -21,7 +21,7 @@ var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(7) "CParent" string(7) "CParent" Done diff --git a/ext/reflection/tests/bug39067.phpt b/ext/reflection/tests/bug39067.phpt index 8a7a6044e1..7fa073ba3b 100644 --- a/ext/reflection/tests/bug39067.phpt +++ b/ext/reflection/tests/bug39067.phpt @@ -37,7 +37,7 @@ var_dump($rc->getProperty('x')->getDeclaringClass()->getName()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "C" string(1) "B" string(1) "A" diff --git a/ext/reflection/tests/bug39884.phpt b/ext/reflection/tests/bug39884.phpt index dbc57ee521..1d0e04b0b9 100644 --- a/ext/reflection/tests/bug39884.phpt +++ b/ext/reflection/tests/bug39884.phpt @@ -15,7 +15,7 @@ $test1->paramTest($test2); $refParam = new ReflectionParameter(array('stubParamTest', 'paramTest'), 'param'); var_dump($refParam->getClass()); ?> ---EXPECT-- +--EXPECT-- object(ReflectionClass)#4 (1) { ["name"]=> string(13) "stubParamTest" diff --git a/ext/reflection/tests/bug40431.phpt b/ext/reflection/tests/bug40431.phpt index 0c96e70faf..637b1457cd 100644 --- a/ext/reflection/tests/bug40431.phpt +++ b/ext/reflection/tests/bug40431.phpt @@ -76,7 +76,7 @@ var_dump($props[0]->isProtected()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- === 1st test === array(1) { [0]=> diff --git a/ext/reflection/tests/bug40794.phpt b/ext/reflection/tests/bug40794.phpt index bb93b91280..fc2fb563d9 100644 --- a/ext/reflection/tests/bug40794.phpt +++ b/ext/reflection/tests/bug40794.phpt @@ -20,7 +20,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { ["prop1"]=> string(1) "1" diff --git a/ext/reflection/tests/bug41061.phpt b/ext/reflection/tests/bug41061.phpt index 771cd408d9..d907907dcf 100644 --- a/ext/reflection/tests/bug41061.phpt +++ b/ext/reflection/tests/bug41061.phpt @@ -5,7 +5,7 @@ Reflection Bug #41061 ("visibility error" in ReflectionFunction::export()) function foo() { } - + class bar { private function foo() { } diff --git a/ext/reflection/tests/bug41884.phpt b/ext/reflection/tests/bug41884.phpt index f8c0a0a2bc..e707bdc100 100644 --- a/ext/reflection/tests/bug41884.phpt +++ b/ext/reflection/tests/bug41884.phpt @@ -15,7 +15,7 @@ var_dump($class->getDefaultProperties()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(2) { ["fooStatic"]=> string(3) "foo" diff --git a/ext/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt index 21aff8d4cc..0b147aa811 100644 --- a/ext/reflection/tests/bug42976.phpt +++ b/ext/reflection/tests/bug42976.phpt @@ -18,12 +18,12 @@ $x = "x.original"; $rc->newInstance($x); // causes crash var_dump($x); $x = "x.original"; -$rc->newInstanceArgs(array($x)); // causes crash +$rc->newInstanceArgs(array($x)); // causes crash var_dump($x); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(9) "x.changed" Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 15 diff --git a/ext/reflection/tests/bug45571.phpt b/ext/reflection/tests/bug45571.phpt index 4df542ede1..2aa5698879 100644 --- a/ext/reflection/tests/bug45571.phpt +++ b/ext/reflection/tests/bug45571.phpt @@ -7,7 +7,7 @@ Class A { static private $a = 0; static protected $b = 1; static public $c = 2; - + private function f() {} private static function sf() {} } diff --git a/ext/reflection/tests/bug45765.phpt b/ext/reflection/tests/bug45765.phpt index 7963a03eea..80cb39d0ac 100644 --- a/ext/reflection/tests/bug45765.phpt +++ b/ext/reflection/tests/bug45765.phpt @@ -9,16 +9,16 @@ class foo2 { class foo extends foo2 { const BAR = "foo's bar"; - + function test($a = self::BAR) { } - + function test2($a = parent::BAR) { } function test3($a = foo::BAR) { } - + function test4($a = foo2::BAR) { } } diff --git a/ext/reflection/tests/bug46064.phpt b/ext/reflection/tests/bug46064.phpt index 510e71b00a..d8ee411905 100644 --- a/ext/reflection/tests/bug46064.phpt +++ b/ext/reflection/tests/bug46064.phpt @@ -36,7 +36,7 @@ class bar extends test { public function __construct() { $this->foobar = 2; $this->a = 200; - + $p = new reflectionproperty($this, 'foobar'); var_dump($p->getValue($this), $p->isDefault(), $p->isPublic()); } diff --git a/ext/reflection/tests/bug46064_2.phpt b/ext/reflection/tests/bug46064_2.phpt index 0b74708dff..6ac72bbd27 100644 --- a/ext/reflection/tests/bug46064_2.phpt +++ b/ext/reflection/tests/bug46064_2.phpt @@ -3,7 +3,7 @@ Bug #46064.2 (Exception when creating ReflectionProperty object on dynamicly cre --FILE-- <?php -class foo { +class foo { } $x = new foo; @@ -25,7 +25,7 @@ class test extends bar { public function __construct() { parent::__construct(); - + $p = new reflectionobject($this); var_dump($h = $p->getProperty('a')); var_dump($h->isDefault(), $h->isProtected(), $h->isPrivate(), $h->isPublic(), $h->isStatic()); diff --git a/ext/reflection/tests/bug47254.phpt b/ext/reflection/tests/bug47254.phpt index 38cdcd62b4..e3ce114c9c 100644 --- a/ext/reflection/tests/bug47254.phpt +++ b/ext/reflection/tests/bug47254.phpt @@ -9,7 +9,7 @@ Testfest 2009 Munich class A { protected function a() {} - + } class B extends A diff --git a/ext/reflection/tests/bug49719.phpt b/ext/reflection/tests/bug49719.phpt index 215140a45a..b27312e6cd 100644 --- a/ext/reflection/tests/bug49719.phpt +++ b/ext/reflection/tests/bug49719.phpt @@ -13,10 +13,10 @@ class B extends A { try { $b = new B; $ref = new ReflectionClass($b); - + var_dump(property_exists('b', 'a')); var_dump(property_exists($b, 'a')); - var_dump($ref->hasProperty('a')); + var_dump($ref->hasProperty('a')); var_dump($ref->getProperty('a')); } catch (Exception $e) { var_dump($e->getMessage()); diff --git a/ext/reflection/tests/bug66430.phpt b/ext/reflection/tests/bug66430.phpt index 6e35a0389e..921e2c99d8 100644 --- a/ext/reflection/tests/bug66430.phpt +++ b/ext/reflection/tests/bug66430.phpt @@ -5,7 +5,7 @@ Bug #66430: ReflectionFunction::invoke does not invoke closure with object scope class Alpha { public $message = "Valid representation"; - + public function bravo() { return $this->message; } diff --git a/ext/reflection/tests/bug71767.phpt b/ext/reflection/tests/bug71767.phpt index 8c4059abf4..19d5bc5036 100644 --- a/ext/reflection/tests/bug71767.phpt +++ b/ext/reflection/tests/bug71767.phpt @@ -16,7 +16,7 @@ class Foo { /** wrong docblock */ $arg ) { - + } } diff --git a/ext/reflection/tests/bug72174.phpt b/ext/reflection/tests/bug72174.phpt index 94416d6153..dacfc0e55e 100644 --- a/ext/reflection/tests/bug72174.phpt +++ b/ext/reflection/tests/bug72174.phpt @@ -17,7 +17,7 @@ class Foo var_dump(__METHOD__); return true; } - + public function __get($name) { var_dump(__METHOD__); diff --git a/ext/reflection/tests/bug72661.phpt b/ext/reflection/tests/bug72661.phpt index 40d14922b8..b1cb764beb 100644 --- a/ext/reflection/tests/bug72661.phpt +++ b/ext/reflection/tests/bug72661.phpt @@ -2,7 +2,7 @@ Bug #72661 (ReflectionType::__toString crashes with iterable) --FILE-- <?php -function test(iterable $arg) { } +function test(iterable $arg) { } var_dump((string)(new ReflectionParameter("test", 0))->getType()); ?> diff --git a/ext/reflection/tests/bug74949.phpt b/ext/reflection/tests/bug74949.phpt index d69597efb8..2970c5911f 100644 --- a/ext/reflection/tests/bug74949.phpt +++ b/ext/reflection/tests/bug74949.phpt @@ -14,7 +14,7 @@ echo $r, "\n"; try { echo $r->getPrototype(); } catch (Exception $e) { - echo $e->getMessage(), "\n"; + echo $e->getMessage(), "\n"; } ?> --EXPECT-- diff --git a/ext/reflection/tests/closures_001.phpt b/ext/reflection/tests/closures_001.phpt index 6cc7e6755c..7efc7a4a73 100644 --- a/ext/reflection/tests/closures_001.phpt +++ b/ext/reflection/tests/closures_001.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures ---FILE-- +--FILE-- <?php $closure = function($a, $b = 0) { }; diff --git a/ext/reflection/tests/closures_002.phpt b/ext/reflection/tests/closures_002.phpt index e8b080f5cb..62412a4052 100644 --- a/ext/reflection/tests/closures_002.phpt +++ b/ext/reflection/tests/closures_002.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on invokable objects ---FILE-- +--FILE-- <?php class Test { diff --git a/ext/reflection/tests/closures_003.phpt b/ext/reflection/tests/closures_003.phpt index 4483dc06e3..af975434ce 100644 --- a/ext/reflection/tests/closures_003.phpt +++ b/ext/reflection/tests/closures_003.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures: Segfaults with getParameters() and getDeclaringFunction() ---FILE-- +--FILE-- <?php $closure = function($a, $b = 0) { }; diff --git a/ext/reflection/tests/closures_003_v1.phpt b/ext/reflection/tests/closures_003_v1.phpt index 1b8e1c4d0a..3c6f48772a 100644 --- a/ext/reflection/tests/closures_003_v1.phpt +++ b/ext/reflection/tests/closures_003_v1.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures: Segfaults with getParameters() and getDeclaringFunction() ---FILE-- +--FILE-- <?php $closure = function($a, $b = 0) { }; diff --git a/ext/reflection/tests/closures_004.phpt b/ext/reflection/tests/closures_004.phpt index 807aea1f38..5eeebb5ffd 100644 --- a/ext/reflection/tests/closures_004.phpt +++ b/ext/reflection/tests/closures_004.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures: Segfault with getClosure() on closure itself ---FILE-- +--FILE-- <?php $closure = function() { echo "Invoked!\n"; }; diff --git a/ext/reflection/tests/property_exists.phpt b/ext/reflection/tests/property_exists.phpt index c74b775bb7..d7ecefb775 100644 --- a/ext/reflection/tests/property_exists.phpt +++ b/ext/reflection/tests/property_exists.phpt @@ -8,15 +8,15 @@ class A public $a = 1; protected $b = 2; private $c = 3; - + public $empty; public $init = 1; - + function __toString() { return 'obj(' . get_class($this) . ')'; } - + static function test($oc, $props) { echo '===' . __CLASS__ . "===\n"; @@ -30,7 +30,7 @@ class A class B extends A { private $c = 4; - + static function test($oc, $props) { echo '===' . __CLASS__ . "===\n"; @@ -44,7 +44,7 @@ class B extends A class C extends B { private $d = 5; - + static function test($oc, $props) { echo '===' . __CLASS__ . "===\n"; diff --git a/ext/reflection/tests/static_properties_002.phpt b/ext/reflection/tests/static_properties_002.phpt index 218c629cdb..a0db78bf2a 100644 --- a/ext/reflection/tests/static_properties_002.phpt +++ b/ext/reflection/tests/static_properties_002.phpt @@ -5,11 +5,11 @@ Reflection and inheriting static properties class base { static protected $prop = 2; - + static function show() { echo __METHOD__ . '(' . self::$prop . ")\n"; } - + static function inc() { base::$prop++; echo __METHOD__ . "()\n"; @@ -18,7 +18,7 @@ class base { class derived extends base { static public $prop = 2; - + static function show() { echo __METHOD__ . '(' . self::$prop . ")\n"; } diff --git a/ext/reflection/tests/traits002.phpt b/ext/reflection/tests/traits002.phpt index b55b288aa0..3a4b294961 100644 --- a/ext/reflection/tests/traits002.phpt +++ b/ext/reflection/tests/traits002.phpt @@ -7,7 +7,7 @@ abstract class foo { } trait bar { - + } reflectionclass::export('foo'); diff --git a/ext/reflection/tests/traits003.phpt b/ext/reflection/tests/traits003.phpt index c569a8e723..7f87859908 100644 --- a/ext/reflection/tests/traits003.phpt +++ b/ext/reflection/tests/traits003.phpt @@ -7,11 +7,11 @@ abstract class foo { } trait bar { - + } final class baz { - + } $x = new ReflectionClass('foo'); |