fix issue where getMethodContents was calling declaring classes filen…

…ame causing issues lookingup methods of traits
zendframework · Sep 14, 2014 · d25bffa · d25bffa
1 parent 27d5bb7
commit d25bffa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/library/Zend/Code/Reflection/MethodReflection.php b/library/Zend/Code/Reflection/MethodReflection.php
@@ -213,7 +213,7 @@ public function getBody()
      */
     protected function extractMethodContents($bodyOnly=false)
     {
-        $fileName = $this->getDeclaringClass()->getFileName();
+        $fileName = $this->getFileName();
 
         if ((class_exists($this->class) && false === $fileName) || ! file_exists($fileName)) {
             return '';

diff --git a/tests/ZendTest/Code/Reflection/MethodReflectionTest.php b/tests/ZendTest/Code/Reflection/MethodReflectionTest.php
@@ -359,11 +359,11 @@ public function testCodeGetBodyReturnsEmptyWithCommentedFunction()
      */
     public function testCanParseClassBodyWhenUsingTrait()
     {
-        include __DIR__ .'/TestAsset/TestTraitClass1.php';
+        require_once __DIR__ .'/TestAsset/TestTraitClass1.php';
         require_once __DIR__. '/TestAsset/TestTraitClass2.php';
-        $method = new \Zend\Code\Reflection\ClassReflection('\FooClass');
-        $traits = current($method->getTraits());
-
-        $this->assertEquals(trim($traits->getMethod('getDummy')->getBody()), 'return $this->dummy;');
+        // $method = new \Zend\Code\Reflection\ClassReflection('\FooClass');
+        // $traits = current($method->getTraits());
+        $method = new \Zend\Code\Reflection\MethodReflection('FooClass', 'getDummy');
+        $this->assertEquals(trim($method->getBody()), 'return $this->dummy;');
     }
 }
diff --git a/tests/ZendTest/Code/Reflection/TestAsset/TestTraitClass1.php b/tests/ZendTest/Code/Reflection/TestAsset/TestTraitClass1.php
@@ -1,6 +1,6 @@
 <?php
 //issue #6620
-include_once 'TestTraitClass2.php';
+require_once 'TestTraitClass2.php';
 class FooClass
 {
 	use TestTrait;