Updated DI extension.

kriswallsmith · Jul 19, 2010 · 5b9ff0d · 5b9ff0d
1 parent 6b3d880
commit 5b9ff0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/DependencyInjection/FacebookExtension.php b/DependencyInjection/FacebookExtension.php
@@ -2,31 +2,30 @@
 
 namespace Bundle\Kris\FacebookBundle\DependencyInjection;
 
-use Symfony\Components\DependencyInjection\Loader\LoaderExtension;
+use Symfony\Components\DependencyInjection\Extension\Extension;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Components\DependencyInjection\BuilderConfiguration;
-use Symfony\Components\DependencyInjection\ContainerInterface;
+use Symfony\Components\DependencyInjection\ContainerBuilder;
 
-class FacebookExtension extends LoaderExtension
+class FacebookExtension extends Extension
 {
     protected $resources = array(
         'facebook' => 'facebook.xml',
     );
 
-    public function apiLoad($config, BuilderConfiguration $configuration)
+    public function apiLoad($config, ContainerBuilder $container)
     {
-        if (!$configuration->hasDefinition('kris.facebook')) {
-            $loader = new XmlFileLoader(__DIR__.'/../Resources/config');
-            $configuration->merge($loader->load($this->resources['facebook']));
+        if (!$container->hasDefinition('kris.facebook')) {
+            $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
+            $loader->load($this->resources['facebook']);
         }
 
         if (isset($config['alias'])) {
-            $configuration->setAlias($config['alias'], 'kris.facebook');
+            $container->setAlias($config['alias'], 'kris.facebook');
         }
 
         foreach (array('class', 'app_id', 'secret', 'cookie', 'domain', 'logging', 'culture') as $attribute) {
             if (isset($config[$attribute])) {
-                $configuration->setParameter('kris.facebook.'.$attribute, $config[$attribute]);
+                $container->setParameter('kris.facebook.'.$attribute, $config[$attribute]);
             }
         }
     }

diff --git a/KrisFacebookBundle.php b/KrisFacebookBundle.php
@@ -4,13 +4,13 @@
 
 use Symfony\Framework\Bundle\Bundle;
 use Symfony\Components\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Components\DependencyInjection\Loader\Loader;
+use Symfony\Components\DependencyInjection\ContainerBuilder;
 use Bundle\Kris\FacebookBundle\DependencyInjection\FacebookExtension;
 
 class KrisFacebookBundle extends Bundle
 {
     public function buildContainer(ParameterBagInterface $parameterBag)
     {
-        Loader::registerExtension(new FacebookExtension());
+        ContainerBuilder::registerExtension(new FacebookExtension());
     }
 }