Merge pull request #371 from symfony-cmf/new_tree_browser_version

use d&d from tree browser

Author: ElectricMaxxx

.travis.yml

@@ -4,7 +4,7 @@ php:
   - 5.6
   - 7.0
   # 7.1 is tested using composer install
-  - hhvm
+  #- hhvm does not work on travis anymore even with dist: trusty
 
 sudo: false
 

app/config/config.yml

@@ -117,7 +117,7 @@ cmf_menu:
 
 cmf_resource:
     description:
-        enhancers: [sonata_phpcr_admin, cmf_tree_icons]
+        enhancers: [sonata_phpcr_admin, cmf_tree_icons, doctrine_phpcr_position]
     repositories:
         default:
             type: doctrine/phpcr-odm

app/config/routing.yml

@@ -52,3 +52,7 @@ block_cache:
 cmf_resource:
     resource: '@CmfResourceRestBundle/Resources/config/routing.yml'
     prefix: /admin
+
+sonata_phpcr_admin_tree:
+    resource: '@SonataDoctrinePHPCRAdminBundle/Resources/config/routing/tree.xml'
+    prefix: /admin

composer.lock

@@ -104,6 +104,11 @@ protected function doTestReachableAdminRoutes($admin)
                 continue;
             }
 
+            // batch routes from new admin integration would need POST request
+            if (strpos($route->getPath(), 'batch')) {
+                continue;
+            }
+
             // do not test POST routes
             if (isset($requirements['_method'])) {
                 if ($requirements['_method'] != 'GET') {