Merge branch '1.12.x'

* 1.12.x: Add number-aware underscore naming strategy Use XMLBundle in container tests [DoctrineDataCollector] Handle runnable flag Fix deprecation failures around doctrine:mapping:import command Deprecated alias for common interfaces
doctrine · Nov 19, 2019 · 8282627 · 8282627
2 parents f4262c8 + a374f3b
commit 8282627
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 13 deletions.
diff --git 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
@@ -137,6 +137,10 @@
         <!-- naming strategy -->
         <service id="doctrine.orm.naming_strategy.default" class="%doctrine.orm.naming_strategy.default.class%" public="false" />
         <service id="doctrine.orm.naming_strategy.underscore" class="%doctrine.orm.naming_strategy.underscore.class%" public="false" />
+        <service id="doctrine.orm.naming_strategy.underscore_number_aware" class="%doctrine.orm.naming_strategy.underscore.class%" public="false">
+            <argument type="constant">CASE_LOWER</argument>
+            <argument>true</argument>
+        </service>
 
         <!-- quote strategy -->
         <service id="doctrine.orm.quote_strategy.default" class="%doctrine.orm.quote_strategy.default.class%" public="false" />

diff --git a/Resources/views/Collector/db.html.twig b/Resources/views/Collector/db.html.twig
@@ -246,9 +246,10 @@
                                 <div class="text-small font-normal">
                                     <a href="#" {{ profiler_markup_version == 1 ? 'onclick="return toggleRunnableQuery(this);"' }} class="sf-toggle link-inverse" data-toggle-selector="#formatted-query-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide formatted query">View formatted query</a>
 
-                                    &nbsp;&nbsp;
-
-                                    <a href="#" {{ profiler_markup_version == 1 ? 'onclick="return toggleRunnableQuery(this);"' }} class="sf-toggle link-inverse" data-toggle-selector="#original-query-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide runnable query">View runnable query</a>
+                                    {% if query.runnable %}
+                                        &nbsp;&nbsp;
+                                        <a href="#" {{ profiler_markup_version == 1 ? 'onclick="return toggleRunnableQuery(this);"' }} class="sf-toggle link-inverse" data-toggle-selector="#original-query-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide runnable query">View runnable query</a>
+                                    {% endif %}
 
                                     {% if query.explainable %}
                                         &nbsp;&nbsp;
@@ -265,9 +266,11 @@
                                     {{ query.sql|doctrine_pretty_query }}
                                 </div>
 
-                                <div id="original-query-{{ i }}-{{ loop.parent.loop.index }}" class="sql-runnable hidden">
-                                    {{ (query.sql ~ ';')|doctrine_replace_query_parameters(query.params)|doctrine_pretty_query(highlight_only = true) }}
-                                </div>
+                                {% if query.runnable %}
+                                    <div id="original-query-{{ i }}-{{ loop.parent.loop.index }}" class="sql-runnable hidden">
+                                        {{ (query.sql ~ ';')|doctrine_replace_query_parameters(query.params)|doctrine_pretty_query(highlight_only = true) }}
+                                    </div>
+                                {% endif %}
 
                                 {% if query.explainable %}
                                     <div id="explain-{{ i }}-{{ loop.parent.loop.index }}" class="sql-explain"></div>

diff --git 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
@@ -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
@@ -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
@@ -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.