Merge pull request #1 from goetas/profiler-collector

Do not require twig extension

Author: chr-hertel

Collector/MigrationsCollector.php

@@ -5,7 +5,9 @@
 namespace Doctrine\Bundle\MigrationsBundle\Collector;
 
 use Doctrine\Migrations\DependencyFactory;
+use Doctrine\Migrations\Metadata\AvailableMigration;
 use Doctrine\Migrations\Metadata\AvailableMigrationsList;
+use Doctrine\Migrations\Metadata\ExecutedMigration;
 use Doctrine\Migrations\Metadata\ExecutedMigrationsList;
 use Doctrine\Migrations\Metadata\Storage\TableMetadataStorageConfiguration;
 use Symfony\Component\HttpFoundation\Request;
@@ -28,10 +30,14 @@ public function collect(Request $request, Response $response, \Throwable $except
         $planCalculator = $this->dependencyFactory->getMigrationPlanCalculator();
         $statusCalculator = $this->dependencyFactory->getMigrationStatusCalculator();
 
-        $this->data['available_migrations'] = $this->flattenMigrations($planCalculator->getMigrations());
-        $this->data['executed_migrations'] = $this->flattenMigrations($metadataStorage->getExecutedMigrations());
-        $this->data['new_migrations'] = $this->flattenMigrations($statusCalculator->getNewMigrations());
-        $this->data['unavailable_migrations'] = $this->flattenMigrations($statusCalculator->getExecutedUnavailableMigrations());
+        $executedMigrations  = $metadataStorage->getExecutedMigrations();
+        $availableMigrations = $planCalculator->getMigrations();
+
+        $this->data['available_migrations'] = $this->flattenAvailableMigrations($availableMigrations, $executedMigrations);
+        $this->data['executed_migrations'] = $this->flattenExecutedMigrations($executedMigrations, $availableMigrations);
+
+        $this->data['new_migrations'] = $this->flattenAvailableMigrations($statusCalculator->getNewMigrations());
+        $this->data['unavailable_migrations'] = $this->flattenExecutedMigrations($statusCalculator->getExecutedUnavailableMigrations());
 
         $this->data['storage'] = get_class($metadataStorage);
         $configuration = $this->dependencyFactory->getConfiguration();
@@ -63,13 +69,42 @@ public function reset()
         $this->data = [];
     }
 
-    /**
-     * @param AvailableMigrationsList|ExecutedMigrationsList $migrationsList
-     */
-    private function flattenMigrations($migrationsList): array
+    private function flattenAvailableMigrations(AvailableMigrationsList $migrationsList, ?ExecutedMigrationsList $executedMigrations = null): array
     {
-        return array_map(static function ($migration) {
-            return (string)$migration->getVersion();
+        return array_map(static function (AvailableMigration $migration) use ($executedMigrations) {
+            $executedMigration = $executedMigrations && $executedMigrations->hasMigration($migration->getVersion())
+                ? $executedMigrations->getMigration($migration->getVersion())
+                : null;
+
+            return [
+                'version' => (string)$migration->getVersion(),
+                'is_new' => !$executedMigration,
+                'is_unavailable' => false,
+                'description' => $migration->getMigration()->getDescription(),
+                'executed_at' =>  $executedMigration ? $executedMigration->getExecutedAt() : null,
+                'execution_time' =>  $executedMigration ? $executedMigration->getExecutionTime() : null,
+                'file' => (new \ReflectionClass($migration->getMigration()))->getFileName(),
+            ];
+        }, $migrationsList->getItems());
+    }
+
+    private function flattenExecutedMigrations(ExecutedMigrationsList $migrationsList, ?AvailableMigrationsList $availableMigrations = null): array
+    {
+        return array_map(static function (ExecutedMigration $migration) use ($availableMigrations) {
+
+            $availableMigration = $availableMigrations && $availableMigrations->hasMigration($migration->getVersion())
+                ? $availableMigrations->getMigration($migration->getVersion())->getMigration()
+                : null;
+
+            return [
+                'version' => (string)$migration->getVersion(),
+                'is_new' => false,
+                'is_unavailable' => !$availableMigration,
+                'description' => $availableMigration ? $availableMigration->getDescription() : null,
+                'executed_at' => $migration->getExecutedAt(),
+                'execution_time' => $migration->getExecutionTime(),
+                'file' => $availableMigration ? (new \ReflectionClass($availableMigration))->getFileName() : null,
+            ];
         }, $migrationsList->getItems());
     }
 }

Resources/config/services.xml

@@ -146,10 +146,6 @@
             <tag name="data_collector" template="@DoctrineMigrations/Collector/migrations.html.twig" id="doctrine_migrations" priority="249" />
         </service>
 
-        <service id="doctrine_migrations.migrations_extension" class="Doctrine\Bundle\MigrationsBundle\Twig\MigrationsExtension">
-            <argument type="service" id="doctrine.migrations.dependency_factory"/>
-            <tag name="twig.extension" />
-        </service>
     </services>
 
 </container>

Resources/views/Collector/migrations.html.twig

@@ -145,31 +145,31 @@
                 <th class="colored font-normal">Execution time</th>
             </tr>
         </thead>
-        {% for name in collector.data.new_migrations %}
-            {{ helper.render_migration(name, collector.data) }}
+        {% for migration in collector.data.new_migrations %}
+            {{ helper.render_migration(migration) }}
         {% endfor %}
 
-        {% for name in collector.data.executed_migrations|reverse %}
-            {{ helper.render_migration(name, collector.data) }}
+        {% for migration in collector.data.executed_migrations|reverse %}
+            {{ helper.render_migration(migration) }}
         {% endfor %}
     </table>
 {% endblock %}
 
-{% macro render_migration(name, data) %}
-    {% set migration = migration_info(name) %}
+{% macro render_migration(migration) %}
+
     <tr>
         <td class="font-normal">
             {% if migration.file %}
-                <a href="{{ migration.file|file_link(1) }}" title="{{ migration.file }}">{{ name }}</a>
+                <a href="{{ migration.file|file_link(1) }}" title="{{ migration.file }}">{{ migration.version }}</a>
             {% else %}
-                {{ name }}
+                {{ migration.version }}
             {% endif %}
         </td>
         <td class="font-normal">{{ migration.description }}</td>
         <td class="font-normal">
-            {% if name in data.new_migrations %}
+            {% if migration.is_new %}
                 <span class="label status-error">NOT EXECUTED</span>
-            {% elseif name in data.unavailable_migrations %}
+            {% elseif migration.is_unavailable %}
                 <span class="label status-warning">UNAVAILABLE</span>
             {% else %}
                 <span class="label status-success">EXECUTED</span>