Merge branch '1.1'

Author: dbu

resources/config/dist/phpcr_odm.php

@@ -19,7 +19,7 @@
             'test_default' => array(
                 'type' => 'annotation',
                 'prefix' => 'Symfony\Cmf\Component\Testing\Document',
-                'dir' => CMF_TEST_ROOT_DIR.'/src/Symfony/Cmf/Component/Testing/Document',
+                'dir' => CMF_TEST_ROOT_DIR.'/src/Document',
                 'is_bundle' => false,
             ),
         ),

src/Phpunit/DatabaseTestListener.php

@@ -36,7 +36,7 @@ public function __construct($processBuilder = null)
             }
 
             // Symfony 2.3 does not support array prefix, so we have to implement it ourselves
-            $this->prefix = array($phpExecutable, __DIR__.'/../../../../../../bin/console');
+            $this->prefix = array($phpExecutable, __DIR__.'/../../bin/console');
         } else {
             $this->processBuilder = $processBuilder;
         }