Merge pull request #13 from symfony-cmf/orm_support

[WIP] Added Orm support

Author: dantleech

bin/console

@@ -1,10 +1,19 @@
 #!/usr/bin/env php
 <?php
 
-$kernel = include __DIR__.'/../bootstrap/kernel_bootstrap.php';
+$rootDir = realpath(__DIR__.'/../../../..');
+$vendorDir = realpath($rootDir.'/vendor');
+require_once $vendorDir.'/symfony-cmf/testing/bootstrap/bootstrap.php';
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 
+$input = new ArgvInput();
+$env = $input->getParameterOption(array('--env', '-e'), 'phpcr');
+
+// must be placed after setting $env, because it's used in bootstrapping the 
+// kernel
+$kernel = include __DIR__.'/../bootstrap/kernel_bootstrap.php';
+
 $application = new Application($kernel);
-$application->run();
+$application->run($input);

bin/travis/phpcr_odm_doctrine_orm_dbal.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+DIR_NAME=`dirname $0`
+CONSOLE_DIR=$DIR_NAME"/.."
+
+# composer install --dev
+php $CONSOLE_DIR"/console" doctrine:database:create --env=orm
+php $CONSOLE_DIR"/console" doctrine:schema:create --env=orm
+php $CONSOLE_DIR"/console" doctrine:phpcr:repository:init

bootstrap/kernel_bootstrap.php

@@ -1,6 +1,5 @@
 <?php
-$rootDir = realpath(__DIR__.'/../../../..');
-$vendorDir = realpath($rootDir.'/vendor');
+
 $phpUnitFile = $rootDir.'/phpunit.xml.dist';
 
 if (!file_exists($phpUnitFile)) {
@@ -22,7 +21,6 @@
     ));
 }
 
-require_once $vendorDir.'/symfony-cmf/testing/bootstrap/bootstrap.php';
 require_once $kernelFile;
 
-return new AppKernel('test', true);
+return new AppKernel($env, true);

resources/config/dist/doctrine.yml

@@ -3,3 +3,5 @@ doctrine:
         driver:   %database_driver%
         path:     %database_path%
         charset:  UTF8
+    orm:
+        auto_mapping: true

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

@@ -4,27 +4,73 @@
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
+/**
+ * The base class for Functional and Web tests.
+ *
+ * @author Daniel Leech <[email protected]>
+ * @author Wouter J <[email protected]>
+ */
 abstract class BaseTestCase extends WebTestCase
 {
+    /**
+     * Use this property to save the DbManager.
+     */
     protected $db;
+
     protected $dbManagers = array();
-    protected $container;
+    protected $settings = array();
+    protected $containers = array();
 
+    /**
+     * Configure the testcase.
+     *
+     * Currently, this is only used for creating a new kernel. This accepts
+     * 2 settings:
+     *
+     *  * environment - The environment to use (defaults to 'phpcr')
+     *  * debug - If debug should be enabled/disabled (defaults to true)
+     *
+     * @param array $options
+     */
+    protected function configure(array $options)
+    {
+        $this->settings = $options;
+    }
+
+    /**
+     * Gets the container.
+     *
+     * @return \Symfony\Component\DependencyInjection\Container
+     */
     public function getContainer()
     {
-        if (null === $this->container) {
-            $client = $this->createClient();
-            $this->container = $client->getContainer();
+        $hash = md5(serialize($this->settings));
+
+        if (!isset($this->containers[$hash])) {
+            $client = $this->createClient($this->settings);
+            $this->containers[$hash] = $client->getContainer();
         }
 
-        return $this->container;
+        return $this->containers[$hash];
     }
 
+    /**
+     * Gets the DbManager.
+     *
+     * @see self::getDbManager
+     */
     public function db($type)
     {
         return $this->getDbManager($type);
     }
 
+    /**
+     * Gets the DbManager.
+     *
+     * @param string $type The Db type
+     *
+     * @return object
+     */
     public function getDbManager($type)
     {
         if (isset($this->dbManagers[$type])) {
@@ -49,4 +95,19 @@ public function getDbManager($type)
 
         return $this->getDbManager($type);
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * This is overriden to set the default environment to 'phpcr'
+     */
+    protected static function createKernel(array $options = array())
+    {
+        // default environment is 'phpcr'
+        if (!isset($options['environment'])) {
+            $options['environment'] = 'phpcr';
+        }
+
+        parent::createKernel($options);
+    }
 }

src/Symfony/Cmf/Component/Testing/Functional/DbManager/ORM.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Symfony\Cmf\Component\Testing\Functional\DbManager;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\ObjectManager;
+
+/**
+ * The DbManager for the Doctrine2 ORM.
+ *
+ * This manager needs the DoctrineBundle to work.
+ *
+ * @author Wouter J <[email protected]>
+ */
+class ORM
+{
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $om;
+
+    /**
+     * Constructor.
+     *
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Gets the Doctrine ManagerRegistry
+     *
+     * @return ManagerRegistry
+     */
+    public function getRegistry()
+    {
+        return $this->container->get('doctrine');
+    }
+
+    /**
+     * Gets the Doctrine ObjectManager
+     *
+     * @return ObjectManager
+     */
+    public function getOm()
+    {
+        if (!$this->om) {
+            $this->om = $this->getRegistry()->getManager();
+        }
+
+        return $this->om;
+    }
+}