From 159083631dec198175e7aa067ef57a33f67a466b Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Fri, 13 Nov 2015 13:55:11 +0100 Subject: [PATCH 1/2] Explicit namespaces for annotation entity mappings --- src/Rixxi/Gedmo/DI/OrmExtension.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Rixxi/Gedmo/DI/OrmExtension.php b/src/Rixxi/Gedmo/DI/OrmExtension.php index c3508b9..2a3c25b 100644 --- a/src/Rixxi/Gedmo/DI/OrmExtension.php +++ b/src/Rixxi/Gedmo/DI/OrmExtension.php @@ -44,18 +44,17 @@ public function getEntityMappings() $config = $this->getValidatedConfig(); $annotations = array( - 'loggable', - 'translatable', - 'treeable', + 'loggable' => 'Loggable', + 'translatable' => 'Translatable', + 'treeable' => 'Treeable', ); $path = realpath(__DIR__ . '/../../../../../../gedmo/doctrine-extensions/lib/Gedmo'); $mappings = array(); - foreach ($annotations as $annotation) { + foreach ($annotations as $annotation => $namespace) { if ($config['all'] || $config[$annotation]) { - $name = ucfirst($annotation); - $mappings["Gedmo\\$name\\Entity"] = "$path/$name/Entity"; + $mappings["Gedmo\\$namespace\\Entity"] = "$path/$namespace/Entity"; } } From fd58a600cd70d08d02d162fea4c52c37ff6dbd1a Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Fri, 13 Nov 2015 13:55:41 +0100 Subject: [PATCH 2/2] Bugfix: Treeable annotation using wrong namespace #14 --- src/Rixxi/Gedmo/DI/OrmExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Rixxi/Gedmo/DI/OrmExtension.php b/src/Rixxi/Gedmo/DI/OrmExtension.php index 2a3c25b..4574b22 100644 --- a/src/Rixxi/Gedmo/DI/OrmExtension.php +++ b/src/Rixxi/Gedmo/DI/OrmExtension.php @@ -46,7 +46,7 @@ public function getEntityMappings() $annotations = array( 'loggable' => 'Loggable', 'translatable' => 'Translatable', - 'treeable' => 'Treeable', + 'treeable' => 'Tree', ); $path = realpath(__DIR__ . '/../../../../../../gedmo/doctrine-extensions/lib/Gedmo');