Various changes

- Fixed manager factory to not return new instances.
- Enabled custom documents to be loaded from
  `Tests\Functional\App\Document`

Author: dantleech

skeleton/app/config/default.php

@@ -1,7 +1,17 @@
 <?php
 
+$kernelRootDir = $container->getParameter('kernel.root_dir');
+$bundleName = null;
+
+if (preg_match('&/([a-zA-Z]*?)Bundle&', $kernelRootDir, $matches)) {
+    $bundleName = $matches[1].'Bundle';
+    $bundleFQN = 'Symfony\\Cmf\\Bundle\\'.$matches[1].'Bundle';
+    $container->setParameter('cmf_testing.bundle_name', $bundleName);
+    $container->setParameter('cmf_testing.bundle_fqn', $bundleFQN);
+}
+
 $loader->import('dist/parameters.yml');
 $loader->import('dist/framework.yml');
 $loader->import('dist/doctrine.yml');
-$loader->import('dist/phpcrodm.yml');
 $loader->import('dist/security.yml');
+$loader->import('dist/phpcrodm.php');

skeleton/app/config/dist/phpcrodm.php

@@ -0,0 +1,37 @@
+<?php
+
+$config = array(
+    'session' => array(
+        'backend' =>  '%phpcr_backend%',
+        'workspace' => '%phpcr_workspace%',
+        'username' => '%phpcr_user%',
+        'password' => '%phpcr_pass%',
+    ),
+    'odm' => array(
+        'auto_mapping' => true,
+        'auto_generate_proxy_classes' => '%kernel.debug%',
+        'locales' => array(
+            'en' => array('de', 'fr'),
+            'de' => array('en', 'fr'),
+            'fr' => array('en', 'de'),
+        ),
+    ),
+);
+
+$kernelRootDir = $container->getParameter('kernel.root_dir');
+$bundleFQN = $container->getParameter('cmf_testing.bundle_fqn');
+$phpcrOdmDocDir = sprintf('%s/../Document', $kernelRootDir);
+$phpcrOdmDocPrefix = sprintf('%s\Tests\Functional\App\Document', $bundleFQN);
+
+if (file_exists($phpcrOdmDocDir)) {
+    $config['odm']['mappings'] = array(
+        'test' => array(
+            'type' => 'annotation',
+            'prefix' => $phpcrOdmDocPrefix,
+            'dir' => $phpcrOdmDocDir,
+            'is_bundle' => false,
+        ),
+    );
+}
+
+$container->loadFromExtension('doctrine_phpcr', $config);

skeleton/app/config/dist/phpcrodm.yml

@@ -7,6 +7,7 @@
 abstract class BaseTestCase extends WebTestCase
 {
     protected $db;
+    protected $dbManagers = array();
 
     public function getContainer()
     {
@@ -22,6 +23,10 @@ public function db($type)
 
     public function getDbManager($type)
     {
+        if (isset($this->dbManagers[$type])) {
+            return $this->dbManagers[$type];
+        }
+
         $className = sprintf(
             'Symfony\Cmf\Component\Testing\Functional\DbManager\%s',
             $type
@@ -36,6 +41,8 @@ public function getDbManager($type)
 
         $dbManager = new $className($this->getContainer());
 
-        return $dbManager;
+        $this->dbManagers[$type] = $dbManager;
+
+        return $this->getDbManager($type);
     }
 }

src/Symfony/Cmf/Component/Testing/Functional/BaseTestCase.php

@@ -13,6 +13,7 @@
 class PHPCR
 {
     protected $container;
+    protected $om;
 
     public function __construct(ContainerInterface $container)
     {
@@ -26,8 +27,10 @@ public function getRegistry()
 
     public function getOm()
     {
-        $om = $this->getRegistry()->getManager();
-        return $om;
+        if (!$this->om) {
+            $this->om = $this->getRegistry()->getManager();
+        }
+        return $this->om;
     }
 
     public function loadFixtures(array $classNames)