Merge remote-tracking branch 'weierophinney/feature/doctrine-annotati…

…ons'

src/Definition/CompilerDefinition.php

@@ -103,7 +103,9 @@ public function addCodeScannerFile(FileScanner $fileScanner)
      */
     public function compile()
     {
-        /* @var $classScanner \Zend\Code\Scanner\DerivedClassScanner */
+        /* 
+         * @var $classScanner \Zend\Code\Scanner\DerivedClassScanner 
+         */
         foreach ($this->directoryScanner->getClassNames() as $class) {
             $this->processClass($class);
         }
@@ -120,7 +122,6 @@ protected function processClass($class)
     {
         $strategy = $this->introspectionStrategy; // localize for readability
 
-        /** @var $rClass \Zend\Code\Reflection\ClassReflection */
         try {
             $rClass = new Reflection\ClassReflection($class);
         } catch (\ReflectionException $e) {
@@ -147,7 +148,8 @@ protected function processClass($class)
             $annotations = $rClass->getAnnotations($strategy->getAnnotationManager());
 
             if (($annotations instanceof AnnotationCollection)
-                && $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Instantiator')) {
+                && $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Instantiator')
+            ) {
                 // @todo Instnatiator support in annotations
             }
         }
@@ -196,7 +198,8 @@ protected function processClass($class)
                 $annotations = $rMethod->getAnnotations($strategy->getAnnotationManager());
 
                 if (($annotations instanceof AnnotationCollection)
-                    && $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Inject')) {
+                    && $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Inject')
+                ) {
 
                     $def['methods'][$methodName] = true;
                     $this->processParams($def, $rClass, $rMethod);

src/Definition/IntrospectionStrategy.php

@@ -3,6 +3,7 @@
 namespace Zend\Di\Definition;
 
 use Zend\Code\Annotation\AnnotationManager;
+use Zend\Code\Annotation\Parser\GenericAnnotationParser;
 
 class IntrospectionStrategy
 {
@@ -54,7 +55,9 @@ public function getAnnotationManager()
     public function createDefaultAnnotationManager()
     {
         $annotationManager = new AnnotationManager;
-        $annotationManager->registerAnnotation(new Annotation\Inject());
+        $parser            = new GenericAnnotationParser();
+        $parser->registerAnnotation(new Annotation\Inject());
+        $annotationManager->attach($parser);
         return $annotationManager;
     }