Support changing environments

Author: wouterj

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);

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);

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

@@ -8,16 +8,24 @@ abstract class BaseTestCase extends WebTestCase
 {
     protected $db;
     protected $dbManagers = array();
-    protected $container;
+    protected $settings = array();
+    protected $containers = array();
+
+    protected function configure(array $options)
+    {
+        $this->settings = $options;
+    }
 
     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];
     }
 
     public function db($type)
@@ -49,4 +57,17 @@ public function getDbManager($type)
 
         return $this->getDbManager($type);
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected static function createKernel(array $options = array())
+    {
+        // default environment is 'phpcr'
+        if (!isset($options['environment'])) {
+            $options['environment'] = 'phpcr';
+        }
+
+        parent::createKernel($options);
+    }
 }