New configuration style.

liverbool · May 7, 2015 · 4d6060f · 4d6060f
1 parent 9329e24
commit 4d6060f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -13,17 +13,12 @@ class Configuration extends AbstractResourceConfiguration
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('dos_user');
 
-        $this->addDefaults($rootNode, 'doctrine/orm', 'default', array(
-            'user' => array('Default'),
-            'user_group' => array('Default'),
-        ));
-
-        $rootNode
-            ->append($this->createResourcesSection(array(
+        $this->setDefaults($treeBuilder->root('dos_user'), array(
+            'classes' => array(
                 'user' => array(
                     'model' => 'DoS\UserBundle\Model\User',
+                    'interface' => 'DoS\UserBundle\Model\UserInterface',
                     'repository' => 'DoS\UserBundle\Doctrine\ORM\UserRepository',
                     'controller' => 'DoS\UserBundle\Controller\UserController',
                     'form' => array(
@@ -32,16 +27,22 @@ public function getConfigTreeBuilder()
                 ),
                 'user_group' => array(
                     'model' => 'DoS\UserBundle\Model\Group',
+                    'interface' => 'DoS\UserBundle\Model\GroupInterface',
                     'form' => array(
                         'default' => 'DoS\UserBundle\Form\Type\GroupType',
                         'choice' => 'DoS\UserBundle\Form\Type\GroupChoiceType',
                     ),
                 ),
                 'user_oauth' => array(
                     'model' => 'DoS\UserBundle\Model\UserOAuth',
+                    'interface' => 'DoS\UserBundle\Model\UserOAuthInterface',
                 ),
-            )))
-        ;
+            ),
+            'validation_groups' => array(
+                'user' => array('Default'),
+                'user_group' => array('Default'),
+            )
+        ));
 
         return $treeBuilder;
     }

diff --git a/DoSUserBundle.php b/DoSUserBundle.php
@@ -6,15 +6,4 @@
 
 class DoSUserBundle extends AbstractResourceBundle
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function getModelInterfaces()
-    {
-        return array(
-            'DoS\UserBundle\Model\UserInterface' => 'dos.model.user.class',
-            'DoS\UserBundle\Model\UserOAuthInterface' => 'dos.model.user_oauth.class',
-            'DoS\UserBundle\Model\GroupInterface' => 'dos.model.user_group.class',
-        );
-    }
 }