From 6a2a0d4e664936857375a0d32f8700270ddfaea9 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@fc.up.pt>
Date: Mon, 7 Sep 2020 23:47:50 +0000
Subject: [PATCH] [TOOLS] Add support for updating autocode in modules

---
 bin/generate_entity_fields | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/generate_entity_fields b/bin/generate_entity_fields
index d06be88d72..f1dbc0e951 100755
--- a/bin/generate_entity_fields
+++ b/bin/generate_entity_fields
@@ -22,10 +22,9 @@ const types = [
     'phone_number' => 'PhoneNumber',
 ];
 
-$path = Yaml::parseFile(ROOT . '/config/services.yaml')['services']['app.core.schemadef_driver']['arguments'][0];
-$path = str_replace('%kernel.project_dir%', ROOT, $path);
-
-$files = glob($path . '/*.php');
+$files = array_merge(glob(ROOT . '/src/Entity/*.php'),
+                     array_merge(glob(ROOT . '/components/*/Entity/*.php'),
+                                 glob(ROOT . '/plugins/*/Entity/*.php')));
 
 $classes = [];
 
@@ -35,7 +34,7 @@ foreach ($files as $file) {
 
     $declared = get_declared_classes();
     foreach ($declared as $dc) {
-        if (preg_match('/App\\\\Entity/', $dc) && !in_array($dc, $classes)) {
+        if (preg_match('/(App|(Component|Plugin)\\\\[^\\\\]+)\\\\Entity/', $dc) && !in_array($dc, $classes)) {
             $class = $dc;
             $classes[] = $class;
             break;