Merge branch 'feature/3965' into develop

Close #3965
zendframework · Mar 12, 2013 · f3a579b · f3a579b
2 parents a21a096 + 466269d
commit f3a579b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/library/Zend/Code/Generator/ClassGenerator.php b/library/Zend/Code/Generator/ClassGenerator.php
@@ -617,7 +617,7 @@ public function getMethods()
      */
     public function getMethod($methodName)
     {
-        foreach ($this->getMethods() as $method) {
+        foreach ($this->methods as $method) {
             if ($method->getName() == $methodName) {
                 return $method;
             }
@@ -626,6 +626,22 @@ public function getMethod($methodName)
         return false;
     }
 
+    /**
+     * @param  string $methodName
+     * @return ClassGenerator
+     */
+    public function removeMethod($methodName)
+    {
+        foreach ($this->methods as $key => $method) {
+            if ($method->getName() == $methodName) {
+                unset($this->methods[$key]);
+                break;
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * @param  string $methodName
      * @return bool

diff --git a/tests/ZendTest/Code/Generator/ClassGeneratorTest.php b/tests/ZendTest/Code/Generator/ClassGeneratorTest.php
@@ -173,6 +173,16 @@ public function testHasMethod()
         $this->assertTrue($classGenerator->hasMethod('methodOne'));
     }
 
+    public function testRemoveMethod()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->addMethod('methodOne');
+        $this->assertTrue($classGenerator->hasMethod('methodOne'));
+
+        $classGenerator->removeMethod('methodOne');
+        $this->assertFalse($classGenerator->hasMethod('methodOne'));
+    }
+
     /**
      * @group ZF-7361
      */