Code refactor with new zend-eventmanager

composer.json

@@ -14,11 +14,11 @@
     },
     "require": {
         "php": ">=5.5",
-        "zendframework/zend-eventmanager": "~2.5"
+        "zendframework/zend-eventmanager": "dev-develop as 2.7.0"
     },
     "require-dev": {
         "doctrine/common": ">=2.1",
-        "zendframework/zend-stdlib": "~2.5",
+        "zendframework/zend-stdlib": "~2.7",
         "zendframework/zend-version": "~2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"

src/Annotation/AnnotationManager.php

@@ -98,9 +98,9 @@ public function createAnnotation(array $annotationData)
         ]);
 
         $eventManager = $this->getEventManager();
-        $results = $eventManager->trigger($event, function ($r) {
+        $results = $eventManager->triggerEventUntil(function ($r) {
             return (is_object($r));
-        });
+        }, $event);
 
         $annotation = $results->last();
 

test/Annotation/AnnotationManagerTest.php

@@ -28,7 +28,6 @@ public function testAllowsMultipleParsingStrategies()
     {
         $genericParser = new Annotation\Parser\GenericAnnotationParser();
         $genericParser->registerAnnotation(__NAMESPACE__ . '\TestAsset\Foo');
-
         $doctrineParser = new Annotation\Parser\DoctrineAnnotationParser();
         $doctrineParser->registerAnnotation(__NAMESPACE__ . '\TestAsset\DoctrineAnnotation');