浏览代码

missing var $subscriberDefinition after merge - forget to save file :B

emgiezet 13 年之前
父节点
当前提交
cbd5b16acc
共有 1 个文件被更改,包括 4 次插入7 次删除
  1. 4 7
      DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php

+ 4 - 7
DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php

@@ -32,15 +32,12 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
         }
 
         foreach ($container->findTaggedServiceIds('jms_serializer.event_subscriber') as $id => $tags) {
-//             $subscriberDefinition = $container->getDefinition($id);
-//             $subscriberClass = $container->getDefinition($id)->getClass();
+            $subscriberDefinition = $container->getDefinition($id);
+            $subscriberClass = $container->getDefinition($id)->getClass();
             
-//             $subscriberClassReflectionObj = new \ReflectionClass($subscriberClass);
+            $subscriberClassReflectionObj = new \ReflectionClass($subscriberClass);
             
-//             if ( ! $subscriberClassReflectionObj->implementsInterface('JMS\SerializerBundle\Serializer\EventDispatcher\EventSubscriberInterface') ) {
-        	$subscriberDefinition = $container->getDefinition($id);
-        	$subscriberClass = $subscriberDefinition->getClass();
-        	if ( ! is_subclass_of($subscriberClass, 'JMS\SerializerBundle\Serializer\EventDispatcher\EventSubscriberInterface')) {
+            if ( ! $subscriberClassReflectionObj->implementsInterface('JMS\SerializerBundle\Serializer\EventDispatcher\EventSubscriberInterface') ) {
                 throw new \RuntimeException(sprintf('The service "%s" (class: %s) does not implement the EventSubscriberInterface.', $id, $subscriberClass));
             }