bug #87 Adapted a change in FOSUserBundle (th-ch)

This PR was merged into the master branch. Discussion ---------- See FriendsOfSymfony/FOSUserBundle@22aea1c This recent change in FOSUserBundle breaks the MultiUserBundle (can be seen when trying to execute a schema update) Commits ------- 0010081 Adapted a change in FOSUserBundle
rollerworks-graveyard · Apr 27, 2015 · fc615c9 · fc615c9
2 parents 0b43a5d + 0010081
commit fc615c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/creating_classes_by_hand.md b/docs/creating_classes_by_hand.md
@@ -33,7 +33,7 @@ doctrine:
                 mappings:
                     FOSUserBundle:
                         type:        xml
-                        dir:         '%kernel.root_dir%/../vendor/friendsofsymfony/user-bundle/Resources/config/doctrine/model'
+                        dir:         '%kernel.root_dir%/../vendor/friendsofsymfony/user-bundle/Resources/config/doctrine-mapping'
                         prefix:      FOS\UserBundle\Model
                         is_bundle:   false
 ```

diff --git a/src/DependencyInjection/Compiler/RegisterFosUserMappingsPass.php b/src/DependencyInjection/Compiler/RegisterFosUserMappingsPass.php
@@ -86,7 +86,7 @@ private static function getMappings()
         if (null === $mappings) {
             $r = new \ReflectionClass('FOS\UserBundle\FOSUserBundle');
             $mappings = array(
-                realpath(dirname($r->getFilename()).'/Resources/config/doctrine/model') => 'FOS\UserBundle\Model',
+                realpath(dirname($r->getFilename()).'/Resources/config/doctrine-mapping') => 'FOS\UserBundle\Model',
             );
         }