diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
index 6d2fa8f42..c2f8a2a40 100644
--- a/DataCollector/DoctrineDataCollector.php
+++ b/DataCollector/DoctrineDataCollector.php
@@ -137,6 +137,8 @@ public function collect(Request $request, Response $response, Throwable $excepti
foreach ($this->data['queries'] as &$queries) {
foreach ($queries as &$query) {
$query['params'] = $this->cloneVar($query['params']);
+ // To be removed when the required minimum version of symfony/doctrine-bridge is >= 4.4
+ $query['runnable'] = $query['runnable'] ?? true;
}
}
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
index a11f9f920..929fba79e 100644
--- a/Resources/config/orm.xml
+++ b/Resources/config/orm.xml
@@ -137,6 +137,10 @@
+
+ CASE_LOWER
+ true
+
diff --git a/Resources/views/Collector/db.html.twig b/Resources/views/Collector/db.html.twig
index c8ef49b89..9dc79f6b5 100644
--- a/Resources/views/Collector/db.html.twig
+++ b/Resources/views/Collector/db.html.twig
@@ -246,9 +246,10 @@
View formatted query
-
-
-
View runnable query
+ {% if query.runnable %}
+
+
View runnable query
+ {% endif %}
{% if query.explainable %}
@@ -265,9 +266,11 @@
{{ query.sql|doctrine_pretty_query }}
-
- {{ (query.sql ~ ';')|doctrine_replace_query_parameters(query.params)|doctrine_pretty_query(highlight_only = true) }}
-
+ {% if query.runnable %}
+
+ {{ (query.sql ~ ';')|doctrine_replace_query_parameters(query.params)|doctrine_pretty_query(highlight_only = true) }}
+
+ {% endif %}
{% if query.explainable %}
diff --git a/Tests/Command/ImportMappingDoctrineCommandTest.php b/Tests/Command/ImportMappingDoctrineCommandTest.php
index 1afa1c55c..01eb46786 100644
--- a/Tests/Command/ImportMappingDoctrineCommandTest.php
+++ b/Tests/Command/ImportMappingDoctrineCommandTest.php
@@ -14,6 +14,9 @@
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\HttpKernel\Kernel;
+/**
+ * @group legacy
+ */
class ImportMappingDoctrineCommandTest extends TestCase
{
/** @var ImportMappingTestingKernel|null */
diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php
index ecaf9338d..c054e7612 100644
--- a/Tests/ContainerTest.php
+++ b/Tests/ContainerTest.php
@@ -35,7 +35,7 @@ protected function setUp()
public function testContainer()
{
- $container = $this->createYamlBundleTestContainer();
+ $container = $this->createXmlBundleTestContainer();
$this->assertInstanceOf(DbalLogger::class, $container->get('doctrine.dbal.logger'));
$this->assertInstanceOf(DoctrineDataCollector::class, $container->get('data_collector.doctrine'));
diff --git a/Tests/TestCase.php b/Tests/TestCase.php
index f16220ce0..0cc187f27 100644
--- a/Tests/TestCase.php
+++ b/Tests/TestCase.php
@@ -25,12 +25,12 @@ protected function setUp()
$this->markTestSkipped('Doctrine is not available.');
}
- public function createYamlBundleTestContainer()
+ public function createXmlBundleTestContainer()
{
$container = new ContainerBuilder(new ParameterBag([
'kernel.name' => 'app',
'kernel.debug' => false,
- 'kernel.bundles' => ['YamlBundle' => 'Fixtures\Bundles\YamlBundle\YamlBundle'],
+ 'kernel.bundles' => ['XmlBundle' => 'Fixtures\Bundles\XmlBundle\XmlBundle'],
'kernel.cache_dir' => sys_get_temp_dir(),
'kernel.environment' => 'test',
'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
@@ -62,10 +62,10 @@ public function createYamlBundleTestContainer()
'entity_managers' => [
'default' => [
'mappings' => [
- 'YamlBundle' => [
- 'type' => 'yml',
- 'dir' => __DIR__ . '/DependencyInjection/Fixtures/Bundles/YamlBundle/Resources/config/doctrine',
- 'prefix' => 'Fixtures\Bundles\YamlBundle\Entity',
+ 'XmlBundle' => [
+ 'type' => 'xml',
+ 'dir' => __DIR__ . '/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine',
+ 'prefix' => 'Fixtures\Bundles\XmlBundle\Entity',
],
],
],
diff --git a/UPGRADE-1.12.md b/UPGRADE-1.12.md
index 2ed54db24..c18099699 100644
--- a/UPGRADE-1.12.md
+++ b/UPGRADE-1.12.md
@@ -9,3 +9,9 @@ configuring caches through it has been deprecated. If you are using anything
other than the `pool` or `id` cache types, please update your configuration to
either use symfony/cache through the `pool` type or configure your cache
services manually and use the `service` type.
+
+Service aliases
+---------------
+
+ * Deprecated the `Symfony\Bridge\Doctrine\RegistryInterface` and `Doctrine\Bundle\DoctrineBundle\Registry` service alias, use `Doctrine\Common\Persistence\ManagerRegistry` instead.
+ * Deprecated the `Doctrine\Common\Persistence\ObjectManager` service alias, use `Doctrine\ORM\EntityManagerInterface` instead.