Merge pull request #13 from symfony-cmf/fix-resource-handler

Fix some bugs in ResourceHandler

Author: wouterj

Serializer/Jms/Handler/ResourceHandler.php

@@ -86,16 +86,15 @@ private function doSerializeResource(Resource $resource, $depth = 0)
 
         $data['path'] = $resource->getPath();
         $data['repository_path'] = $resource->getRepositoryPath();
-        $children = $resource->listChildren();
 
         $enhancers = $this->enhancerRegistry->getEnhancers($repositoryAlias);
 
         $children = array();
-        foreach ($resource->listChildren() as $name => $resource) {
+        foreach ($resource->listChildren() as $name => $childResource) {
             $children[$name] = array();
 
-            if ($depth < 1) {
-                $children[$name] = $this->doSerializeResource($resource, $depth + 1);
+            if ($depth < 2) {
+                $children[$name] = $this->doSerializeResource($childResource, $depth + 1);
             }
         }
         $data['children'] = $children;

Tests/Features/resource_api_phpcr.feature

@@ -7,10 +7,10 @@ Feature: PHPCR resource repository
         Given the test application has the following configuration:
             """
             cmf_resource:
-                repository:
-                    doctrine_phpcr:
-                        phpcr_repo:
-                            basepath: /tests/cmf/articles
+                repositories:
+                    phpcr_repo:
+                        type: doctrine_phpcr
+                        basepath: /tests/cmf/articles
 
             cmf_resource_rest:
                 enhancer_map:

Tests/Features/resource_api_phpcr_odm.feature

@@ -7,10 +7,10 @@ Feature: PHPCR-ODM resource repository
         Given the test application has the following configuration:
             """
             cmf_resource:
-                repository:
-                    doctrine_phpcr_odm:
-                        phpcrodm_repo:
-                            basepath: /tests/cmf/articles
+                repositories:
+                    phpcrodm_repo:
+                        type: doctrine_phpcr_odm
+                        basepath: /tests/cmf/articles
 
             cmf_resource_rest:
                 payload_alias_map: