Skip to content

Commit 5738710

Browse files
committed
Merge pull request #16 from symfony-cmf/kernel_configuration
Removed "configure" replaced with "getKernelConfiguration"
2 parents 82cb038 + 83c74e0 commit 5738710

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,21 @@ abstract class BaseTestCase extends WebTestCase
1818
protected $db;
1919

2020
protected $dbManagers = array();
21-
protected $settings = array();
2221
protected $containers = array();
2322

2423
/**
25-
* Configure the testcase.
24+
* Return the configuration to use when creating the Kernel.
2625
*
27-
* Currently, this is only used for creating a new kernel. This accepts
28-
* 2 settings:
26+
* The following settings are used:
2927
*
3028
* * environment - The environment to use (defaults to 'phpcr')
3129
* * debug - If debug should be enabled/disabled (defaults to true)
3230
*
33-
* @param array $options
31+
* @return array
3432
*/
35-
protected function configure(array $options)
33+
protected function getKernelConfiguration()
3634
{
37-
$this->settings = $options;
35+
return array();
3836
}
3937

4038
/**
@@ -47,7 +45,7 @@ public function getContainer()
4745
$hash = md5(serialize($this->settings));
4846

4947
if (!isset($this->containers[$hash])) {
50-
$client = $this->createClient($this->settings);
48+
$client = $this->createClient($this->getKernelConfiguration());
5149
$this->containers[$hash] = $client->getContainer();
5250
}
5351

0 commit comments

Comments
 (0)