Upgrade to latest Symfony2 conventions

This commit is contained in:
Thibault Duplessis 2010-07-11 14:09:44 +02:00
parent f671bb5d58
commit 3bd4879746

View file

@ -9,24 +9,16 @@ use Symfony\Components\DependencyInjection\BuilderConfiguration;
class MarkdownExtension extends LoaderExtension
{
public function parserLoad($config)
public function parserLoad($config, $configuration)
{
$configuration = new BuilderConfiguration();
$loader = new XmlFileLoader(__DIR__.'/../Resources/config');
$configuration->merge($loader->load('parser.xml'));
return $configuration;
}
public function helperLoad($config)
public function helperLoad($config, $configuration)
{
$configuration = new BuilderConfiguration();
$loader = new XmlFileLoader(__DIR__.'/../Resources/config');
$configuration->merge($loader->load('helper.xml'));
return $configuration;
$configuration->merge($loader->load('parser.xml'));
}
/**