using array cache for annotations

szjani · Nov 8, 2014 · ae82873 · ae82873
1 parent a53175f
commit ae82873
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -13,6 +13,7 @@
         "php": ">=5.4",
         "precore/precore": "~1.8",
         "doctrine/annotations": "~1.1",
+        "doctrine/cache": "~1.0",
         "lf4php/lf4php": "~4.2",
         "trf4php/trf4php": "~1.1"
     },

diff --git a/src/predaddy/messagehandling/annotation/AnnotatedMessageHandlerDescriptor.php b/src/predaddy/messagehandling/annotation/AnnotatedMessageHandlerDescriptor.php
@@ -25,7 +25,9 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\Reader;
+use Doctrine\Common\Cache\ArrayCache;
 use precore\lang\ObjectClass;
 use predaddy\messagehandling\FunctionDescriptor;
 use predaddy\messagehandling\FunctionDescriptorFactory;
@@ -56,7 +58,7 @@ class AnnotatedMessageHandlerDescriptor implements MessageHandlerDescriptor
 
     public static function init()
     {
-        self::$reader = new AnnotationReader();
+        self::$reader = new CachedReader(new AnnotationReader(), new ArrayCache());
     }
 
     /**

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -4,9 +4,3 @@
     $loader->add('predaddy', __DIR__ . '/src');
 }
 Logger::configure(__DIR__ . '/src/resources/log4php.xml');
-\predaddy\messagehandling\annotation\AnnotatedMessageHandlerDescriptor::setReader(
-    new \Doctrine\Common\Annotations\CachedReader(
-        new \Doctrine\Common\Annotations\AnnotationReader(),
-        new \Doctrine\Common\Cache\ArrayCache()
-    )
-);