merge with experimental

ghua · Oct 30, 2013 · 51e61ad · 51e61ad
2 parents 26fd325 + c5c3d02
commit 51e61ad
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 1,196 deletions.
diff --git a/README.md b/README.md
@@ -68,6 +68,9 @@ In additional, you can use a controller annotation:
     testClassLoader:
         resource: "@AcmeTestBundle/Controller/TestController.php"
 
+    testDirectoryLoader:
+        resource: "@AcmeTestBundle/Controller"
+
 ##### AcmeController.php #####
 
     namespace Acme\TestBundle\Controller;

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -44,5 +44,11 @@ services:
         arguments: [ @ext_direct.controller_resolver, %kernel.debug% ]
 
     ext_direct.router.cache:
-        class: Ext\DirectBundle\Router\Loader\CacheLoader
-        arguments: [ @ext_direct.route.collection, %kernel.cache_dir%, %kernel.debug% ]
+        class: Ext\DirectBundle\Router\Loader\CacheProvider
+        arguments: [ @ext_direct.route.collection, %kernel.cache_dir%, %kernel.debug% ]
+
+    ext_direct.annotation_directory.loader:
+        class: Ext\DirectBundle\Router\Loader\AnnotationDirectoryLoader
+        arguments: [ @ext_direct.annotation_class.loader ]
+        tags:
+            - { name: ext_direct.loader }