From ddc94d6d608e087d5aee51f369a1d6c4f4a36dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=20Waterb=C3=B6hr?= <micha.waterboehr@finanzcheck.de>
Date: Thu, 9 Nov 2023 08:54:25 +0100
Subject: [PATCH] Fix PropelDataCollector

* Use symfony/security-bundle as dependency instead of just  symfony/security-core
* Fix DataCollector to return Data instead of array
---
 DataCollector/PropelDataCollector.php      |  8 ++------
 Resources/views/Collector/propel.html.twig | 14 ++++++++++++--
 composer.json                              |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/DataCollector/PropelDataCollector.php b/DataCollector/PropelDataCollector.php
index 3f5fc7dd..adbd0962 100644
--- a/DataCollector/PropelDataCollector.php
+++ b/DataCollector/PropelDataCollector.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Symfony\Component\VarDumper\Cloner\Data;
 
 /**
  * The PropelDataCollector collector class collects information.
@@ -50,12 +51,7 @@ public function getName(): string
         return 'propel';
     }
 
-    /**
-     * Returns queries.
-     *
-     * @return array Queries
-     */
-    public function getQueries(): array
+    public function getQueries(): Data
     {
         return $this->data['queries'];
     }
diff --git a/Resources/views/Collector/propel.html.twig b/Resources/views/Collector/propel.html.twig
index e3287db3..cfe522ee 100644
--- a/Resources/views/Collector/propel.html.twig
+++ b/Resources/views/Collector/propel.html.twig
@@ -41,13 +41,23 @@
     {# the panel content #}
     <style type="text/css">
     .SQLKeyword {
-        color: blue;
+        color: #1750eb;
         white-space: nowrap;
     }
+
+    .theme-dark .SQLKeyword {
+        color: #54aeff;
+    }
+
     .SQLName {
         color: #464646;
         white-space: nowrap;
     }
+
+    .theme-dark .SQLName {
+        color: #fff;
+    }
+
     .SQLComment {
         color: gray;
         display: block;
@@ -141,5 +151,5 @@
         </table>
     {% endif %}
 
-    {{ render(controller('PropelBundle:Panel:configuration')) }}
+    {{ render(controller('Propel\\Bundle\\PropelBundle\\Controller\\PanelController::configurationAction')) }}
 {% endblock %}
diff --git a/composer.json b/composer.json
index 078d9f3a..1abc9ed5 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "symfony/console": "^4.4|^5.0|^6.0",
         "symfony/dependency-injection": "^4.4|^5.0|^6.0",
         "symfony/framework-bundle": "^4.4|^5.0|^6.0",
-        "symfony/security-core": "^4.4|^5.0|^6.0"
+        "symfony/security-bundle": "^4.4|^5.0|^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",