Merge remote-tracking branch 'astephens25/reflection-fix'

igorw · igorw · commit 755310f42170 · 2013-05-28T00:00:45.000+02:00
* astephens25/reflection-fix:
  Removed destructor from methods enumeration. Updated Dog test class with destructor.
  Modified wrapper reflection to skip enumerating constructor. Updated test wrapper 'Dog' with constructor to ensure constructor is not in enumerated methods.
diff --git a/src/DNode/Session.php b/src/DNode/Session.php
@@ -133,7 +133,7 @@ private function scrub($obj)
                 $reflector = new \ReflectionClass($node);
                 $methods = $reflector->getMethods();
                 foreach ($methods as $method) {
-                    if (!$method->isPublic()) {
+                    if (!$method->isPublic() || $method->isConstructor() || $method->isDestructor()) {
                         continue;
                     }
 
diff --git a/tests/DNode/Dog.php b/tests/DNode/Dog.php
@@ -3,6 +3,14 @@
 
 class Dog
 {
+    public function __construct()
+    {
+    }
+
+    public function __destruct()
+    {
+    }
+
     public function bark()
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ private function scrub($obj)`
`133`	`133`	`$reflector = new \ReflectionClass($node);`
`134`	`134`	`$methods = $reflector->getMethods();`
`135`	`135`	`foreach ($methods as $method) {`
`136`		`- if (!$method->isPublic()) {`
	`136`	`+ if (!$method->isPublic() \|\| $method->isConstructor() \|\| $method->isDestructor()) {`
`137`	`137`	`continue;`
`138`	`138`	`}`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,14 @@`
`3`	`3`
`4`	`4`	`class Dog`
`5`	`5`	`{`
	`6`	`+ public function __construct()`
	`7`	`+ {`
	`8`	`+ }`
	`9`	`+`
	`10`	`+ public function __destruct()`
	`11`	`+ {`
	`12`	`+ }`
	`13`	`+`
`6`	`14`	`public function bark()`
`7`	`15`	`{`
`8`	`16`	`}`