Fixes schmittjoh#16: Inherit method support

Marmelatze · Feb 25, 2013 · dd9041c · dd9041c
1 parent 7018357
commit dd9041c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/DependencyInjection/Compiler/PointcutMatchingPass.php b/DependencyInjection/Compiler/PointcutMatchingPass.php
@@ -132,7 +132,6 @@ private function processDefinition(Definition $definition, $pointcuts, &$interce
 
         $classAdvices = array();
         foreach (ReflectionUtils::getOverrideableMethods($class) as $method) {
-
             if ('__construct' === $method->name) {
                 continue;
             }
@@ -149,13 +148,16 @@ private function processDefinition(Definition $definition, $pointcuts, &$interce
             }
 
             $classAdvices[$method->name] = $advices;
+            $className = ClassUtils::getUserClass($method->getDeclaringClass()->getName());
+            $interceptors[$className][$method->name] = $advices;
+
         }
 
+
         if (empty($classAdvices)) {
             return;
         }
 
-        $interceptors[ClassUtils::getUserClass($class->name)] = $classAdvices;
 
         $generator = new InterceptionGenerator();
         $generator->setFilter(function(\ReflectionMethod $method) use ($classAdvices) {

diff --git a/Tests/DependencyInjection/Compiler/Fixture/LoggingPointcut.php b/Tests/DependencyInjection/Compiler/Fixture/LoggingPointcut.php
@@ -29,6 +29,6 @@ public function matchesClass(\ReflectionClass $class)
 
     public function matchesMethod(\ReflectionMethod $method)
     {
-        return false !== strpos($method->name, 'delete');
+        return false !== stripos($method->name, 'delete');
     }
 }
diff --git a/Tests/DependencyInjection/Compiler/Fixture/ParentService.php b/Tests/DependencyInjection/Compiler/Fixture/ParentService.php
@@ -0,0 +1,16 @@
+<?php
+namespace JMS\AopBundle\Tests\DependencyInjection\Compiler\Fixture;
+
+
+class ParentService
+{
+    public function parentDelete()
+    {
+        return true;
+    }
+
+    public function overwrittenDelete()
+    {
+        return false;
+    }
+}
diff --git a/Tests/DependencyInjection/Compiler/Fixture/TestService.php b/Tests/DependencyInjection/Compiler/Fixture/TestService.php
@@ -18,7 +18,7 @@
 
 namespace JMS\AopBundle\Tests\DependencyInjection\Compiler\Fixture;
 
-class TestService
+class TestService extends ParentService
 {
     public function add()
     {
@@ -29,4 +29,9 @@ public function delete()
     {
         return true;
     }
+
+    public function overwrittenDelete()
+    {
+        return true;
+    }
 }
diff --git a/Tests/DependencyInjection/Compiler/PointcutMatchingPassTest.php b/Tests/DependencyInjection/Compiler/PointcutMatchingPassTest.php
@@ -51,7 +51,9 @@ public function testProcess()
         $this->assertInstanceOf('JMS\AopBundle\Tests\DependencyInjection\Compiler\Fixture\TestService', $service);
         $this->assertTrue($service->add());
         $this->assertTrue($service->delete());
-        $this->assertEquals(array('delete'), $container->get('interceptor')->getLog());
+        $this->assertTrue($service->parentDelete());
+        $this->assertTrue($service->overwrittenDelete());
+        $this->assertEquals(array('delete', 'parentDelete', 'overwrittenDelete'), $container->get('interceptor')->getLog());
     }
 
     protected function setUp()