Merge branch 'pr/1608' into 2.9.x

# Conflicts: # Resources/views/Collector/db.html.twig
doctrine · Jan 6, 2023 · 52c1b20 · 52c1b20
2 parents 4ff5a39 + b7705f2
commit 52c1b20
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -116,7 +116,12 @@ public function collect(Request $request, Response $response, ?Throwable $except
                     }
 
                     $classErrors                        = $validator->validateClass($class);
-                    $entities[$name][$class->getName()] = $class->getName();
+                    $r                                  = $class->getReflectionClass();
+                    $entities[$name][$class->getName()] = [
+                        'class' => $class->getName(),
+                        'file' => $r->getFileName(),
+                        'line' => $r->getStartLine(),
+                    ];
 
                     if (empty($classErrors)) {
                         continue;

diff --git a/Resources/views/Collector/db.html.twig b/Resources/views/Collector/db.html.twig
@@ -398,13 +398,15 @@
                                 </thead>
                                 <tbody>
                                 {% for class in classes %}
-                                    {% set contains_errors = collector.mappingErrors[manager] is defined and collector.mappingErrors[manager][class] is defined %}
+                                    {% set contains_errors = collector.mappingErrors[manager] is defined and collector.mappingErrors[manager][class.class] is defined %}
                                     <tr class="{{ contains_errors ? 'status-error' }}">
-                                        <td>{{ class }}</td>
+                                        <td>
+                                <a href="{{ class.file|file_link(class.line) }}">{{ class. class}}</a>
+                            </td>
                                         <td class="font-normal">
                                             {% if contains_errors %}
                                                 <ul>
-                                                    {% for error in collector.mappingErrors[manager][class] %}
+                                                    {% for error in collector.mappingErrors[manager][class.class] %}
                                                         <li>{{ error }}</li>
                                                     {% endfor %}
                                                 </ul>