Skip to content

Commit

Permalink
Refactor DependencyInjection extension
Browse files Browse the repository at this point in the history
  • Loading branch information
jmikola committed Nov 10, 2010
1 parent bd8ae8f commit 70f6111
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions DependencyInjection/SimpleCASExtension.php
Expand Up @@ -13,12 +13,6 @@
*/
class SimpleCASExtension extends Extension
{
protected $resources = array(
'adapter' => 'adapter.xml',
'client' => 'client.xml',
'helper' => 'helper.xml',
);

/**
* Load the SimpleCAS adapter configuration.
*
Expand All @@ -29,7 +23,7 @@ public function adapterLoad($config, ContainerBuilder $container)
{
if (!$container->hasDefinition('adapter')) {
$loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
$loader->load($this->resources['adapter']);
$loader->load('adapter.xml');
}

if (isset($config['name'])) {
Expand All @@ -39,8 +33,6 @@ public function adapterLoad($config, ContainerBuilder $container)
$container->setParameter('simplecas.adapter.options', $config['options']);
}
}

return $container;
}

/**
Expand All @@ -53,7 +45,7 @@ public function clientLoad($config, ContainerBuilder $container)
{
if (!$container->hasDefinition('client')) {
$loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
$loader->load($this->resources['client']);
$loader->load('client.xml');
}

foreach (array('hostname', 'uri', 'logout_service_redirect') as $key) {
Expand All @@ -69,8 +61,6 @@ public function clientLoad($config, ContainerBuilder $container)
}
}
}

return $container;
}

/**
Expand All @@ -83,10 +73,8 @@ public function helperLoad($config, ContainerBuilder $container)
{
if (!$container->hasDefinition('helper')) {
$loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
$loader->load($this->resources['helper']);
$loader->load('helper.xml');
}

return $container;
}

/**
Expand Down

0 comments on commit 70f6111

Please sign in to comment.