Fixed testclass, removed references to the annotationreaderdecorator.

joshiausdemwald · Jun 23, 2011 · c5d4476 · c5d4476
1 parent 6c00597
commit c5d4476
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/src/Ifschleife/Bundle/AutowiringBundle/Tests/Autowiring/DependencyResolverTest.php b/src/Ifschleife/Bundle/AutowiringBundle/Tests/Autowiring/DependencyResolverTest.php
@@ -39,7 +39,11 @@ public function testDependencyResolving(array $files)
 
         $container->setParameter('superparameter', 'superparametervalue');
 
-        $reader = new \Ifschleife\Bundle\AutowiringBundle\Annotation\AnnotationReaderDecorator;
+        $docParser = new \Doctrine\Common\Annotations\DocParser();
+        $docParser->setAutoloadAnnotations(true);
+        $docParser->setIgnoreNotImportedAnnotations(true);
+
+        $reader = new \Doctrine\Common\Annotations\AnnotationReader($docParser);
 
         $serviceBuilder = new \Ifschleife\Bundle\AutowiringBundle\Autowiring\ServiceBuilder(
             new \Ifschleife\Bundle\AutowiringBundle\DependencyInjection\Loader\AnnotatedFileLoader(
@@ -240,7 +244,11 @@ public function failOptionalArguments()
     {
         $container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
 
-        $reader = new \Ifschleife\Bundle\AutowiringBundle\Annotation\AnnotationReaderDecorator;
+        $docParser = new \Doctrine\Common\Annotations\DocParser;
+        $docParser->setAutoloadAnnotations(true);
+        $docParser->setIgnoreNotImportedAnnotations(true);
+
+        $reader = new \Doctrine\Common\Annotations\AnnotationReader($docParser);
 
         $serviceBuilder = new \Ifschleife\Bundle\AutowiringBundle\Autowiring\ServiceBuilder(
             new \Ifschleife\Bundle\AutowiringBundle\DependencyInjection\Loader\AnnotatedFileLoader(
@@ -295,7 +303,11 @@ public function testOptionalArguments($file)
     {
         $container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
 
-        $reader = new \Ifschleife\Bundle\AutowiringBundle\Annotation\AnnotationReaderDecorator;
+        $docParser = new \Doctrine\Common\Annotations\DocParser();
+        $docParser->setAutoloadAnnotations(true);
+        $docParser->setIgnoreNotImportedAnnotations(true);
+
+        $reader = new \Doctrine\Common\Annotations\AnnotationReader($docParser);
 
         $serviceBuilder = new \Ifschleife\Bundle\AutowiringBundle\Autowiring\ServiceBuilder(
             new \Ifschleife\Bundle\AutowiringBundle\DependencyInjection\Loader\AnnotatedFileLoader(

diff --git a/src/Ifschleife/Bundle/AutowiringBundle/Tests/Autowiring/ServiceBuilderTest.php b/src/Ifschleife/Bundle/AutowiringBundle/Tests/Autowiring/ServiceBuilderTest.php
@@ -38,7 +38,11 @@ function testConstruct()
     {
         $container = new ContainerBuilder;
 
-        $reader = new \Ifschleife\Bundle\AutowiringBundle\Annotation\AnnotationReaderDecorator;
+        $docParser = new \Doctrine\Common\Annotations\DocParser();
+        $docParser->setAutoloadAnnotations(true);
+        $docParser->setIgnoreNotImportedAnnotations(true);
+
+        $reader = new \Doctrine\Common\Annotations\AnnotationReader($docParser);
 
         $loader  = new AnnotatedFileLoader(
             $container,
@@ -74,7 +78,11 @@ function testBuilder(array $files)
     {
         $container = new ContainerBuilder;
 
-        $reader = new \Ifschleife\Bundle\AutowiringBundle\Annotation\AnnotationReaderDecorator;
+        $docParser = new \Doctrine\Common\Annotations\DocParser();
+        $docParser->setAutoloadAnnotations(true);
+        $docParser->setIgnoreNotImportedAnnotations(true);
+
+        $reader = new \Doctrine\Common\Annotations\AnnotationReader($docParser);
 
         $loader  = new AnnotatedFileLoader(
             $container,

diff --git a/...eife/Bundle/AutowiringBundle/Tests/DependencyInjection/Loader/AnnotatedFileLoaderTest.php b/...eife/Bundle/AutowiringBundle/Tests/DependencyInjection/Loader/AnnotatedFileLoaderTest.php
@@ -26,9 +26,10 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Ifschleife\Bundle\AutowiringBundle\Annotation\AnnotationReaderDecorator;
+use Doctrine\Common\Annotations\AnnotationReader;
 use Ifschleife\Bundle\AutowiringBundle\DependencyInjection\Loader\AnnotatedFileLoader;
 use Ifschleife\Bundle\AutowiringBundle\Autowiring\Parser\PhpParser;
+use Doctrine\Common\Annotations\DocParser;
 
 /**
  * AnnotatedFileLoaderTest
@@ -46,7 +47,11 @@ function testFiles($file)
 
         $parser = new PhpParser();
 
-        $reader = new AnnotationReaderDecorator();
+        $docParser = new DocParser();
+        $docParser->setAutoloadAnnotations(true);
+        $docParser->setIgnoreNotImportedAnnotations(true);
+
+        $reader = new AnnotationReader($docParser);
 
         $locator = new FileLocator();
 
@@ -66,7 +71,11 @@ function testMalformedFiles($file)
 
         $parser = new PhpParser();
 
-        $reader = new AnnotationReaderDecorator();
+        $docParser = new DocParser();
+        $docParser->setAutoloadAnnotations(true);
+        $docParser->setIgnoreNotImportedAnnotations(true);
+
+        $reader = new AnnotationReader($docParser);
 
         $locator = new FileLocator();
 
@@ -89,7 +98,11 @@ function testOptionalArguments($file)
 
         $parser = new PhpParser();
 
-        $reader = new AnnotationReaderDecorator();
+        $docParser = new DocParser();
+        $docParser->setIgnoreNotImportedAnnotations(true);
+        $docParser->setAutoloadAnnotations(true);
+
+        $reader = new AnnotationReader($docParser);
 
         $locator = new FileLocator();