diff --git a/DependencyInjection/Compiler/PointcutMatchingPass.php b/DependencyInjection/Compiler/PointcutMatchingPass.php index faf6476..5cd149e 100644 --- a/DependencyInjection/Compiler/PointcutMatchingPass.php +++ b/DependencyInjection/Compiler/PointcutMatchingPass.php @@ -28,6 +28,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use JMS\AopBundle\Aop\PointcutInterface; +use CG\Core\ReflectionUtils; /** * Matches pointcuts against service methods. @@ -130,10 +131,7 @@ private function processDefinition(Definition $definition, $pointcuts, &$interce } $classAdvices = array(); - foreach ($class->getMethods(\ReflectionMethod::IS_PROTECTED | \ReflectionMethod::IS_PUBLIC) as $method) { - if ($method->isFinal()) { - continue; - } + foreach (ReflectionUtils::getOverrideableMethods($class) as $method) { if ('__construct' === $method->name) { continue; diff --git a/Tests/DependencyInjection/Compiler/PointcutMatchingPassTest.php b/Tests/DependencyInjection/Compiler/PointcutMatchingPassTest.php index 7ea2e3d..869c229 100644 --- a/Tests/DependencyInjection/Compiler/PointcutMatchingPassTest.php +++ b/Tests/DependencyInjection/Compiler/PointcutMatchingPassTest.php @@ -22,7 +22,7 @@ use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass; use JMS\AopBundle\DependencyInjection\JMSAopExtension; use JMS\AopBundle\DependencyInjection\Compiler\PointcutMatchingPass; -use Symfony\Component\HttpKernel\Util\Filesystem; +use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\DependencyInjection\ContainerBuilder; class PointcutMatchingPassTest extends \PHPUnit_Framework_TestCase diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7484342..a4d8a79 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,15 +9,15 @@ processIsolation="false" stopOnFailure="false" syntaxCheck="false" - bootstrap="./../../../../app/bootstrap.php.cache" + bootstrap="./../../../../../app/bootstrap.php.cache" > - + ./Tests - + performance