Internal: Adjust PluginBundle entities resolution for nested 'src' directories in PluginEntityPass #6995 #6996

Author: AngelFQC

src/CoreBundle/DependencyInjection/Compiler/PluginEntityPass.php

@@ -23,6 +23,11 @@ public function process(ContainerBuilder $container): void
 
         foreach ($entityDirs as $dir) {
             $pluginTitle = basename(\dirname($dir));
+
+            if ('src' === $pluginTitle) {
+                $pluginTitle = basename(\dirname($dir, 2));
+            }
+
             $namespace = "Chamilo\\PluginBundle\\$pluginTitle";
 
             $driverReference = new Reference('doctrine.orm.default_attribute_metadata_driver');

src/CoreBundle/Helpers/PluginEntityLoaderHelper.php

@@ -17,7 +17,7 @@ public function __construct(
     public function getEntityDirectories(): array
     {
         $finder = new Finder();
-        $finder->directories()->in($this->pluginDir)->name('Entity')->depth('== 1');
+        $finder->directories()->in($this->pluginDir)->name('Entity')->depth('<= 2');
 
         $directories = [];
         foreach ($finder as $dir) {