Pārlūkot izejas kodu

[DoctrineMongoDBBundle] BC-break: This removes the excess "connections" and "document_managers" wrapper in XML. This was inconsistent and made normalization unnecesarily difficult.

Previously:

    <connections>
        <connection ...>
            <!-- .. -->
        </connection>
        <connection ...>
            <!-- .. -->
        </connection>
    </connections>

Now:

    <connection ...>
        <!-- .. -->
    </connection>
    <connection ...>
        <!-- .. -->
    </connection>

I believe this is more semantically correct, and it removes code that had to worry about this extra format and normalize it.
Ryan Weaver 14 gadi atpakaļ
vecāks
revīzija
42a0b22f0e

+ 0 - 12
src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php

@@ -208,14 +208,6 @@ class DoctrineMongoDBExtension extends AbstractDoctrineExtension
         if (count($config['document_managers'])) {
             $configDocumentManagers = $config['document_managers'];
 
-            if (isset($config['document_managers']['document-manager'])) {
-                $config['document_managers']['document_manager'] = $config['document_managers']['document-manager'];
-            }
-
-            if (isset($config['document_managers']['document_manager']) && isset($config['document_managers']['document_manager'][0])) {
-                // Multiple document managers
-                $configDocumentManagers = $config['document_managers']['document_manager'];
-            }
             foreach ($configDocumentManagers as $name => $documentManager) {
                 $documentManagers[isset($documentManager['id']) ? $documentManager['id'] : $name] = $documentManager;
             }
@@ -287,10 +279,6 @@ class DoctrineMongoDBExtension extends AbstractDoctrineExtension
         $connections = array();
         if (count($config['connections'])) {
             $configConnections = $config['connections'];
-            if (isset($config['connections']['connection']) && isset($config['connections']['connection'][0])) {
-                // Multiple connections
-                $configConnections = $config['connections']['connection'];
-            }
             foreach ($configConnections as $name => $connection) {
                 $connections[isset($connection['id']) ? $connection['id'] : $name] = $connection;
             }

+ 13 - 16
src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml

@@ -13,21 +13,18 @@
             proxy-namespace="Proxies"
             auto-generate-proxy-classes="true"
         >
-        <doctrine:connections>
-            <doctrine:connection id="conn1" server="mongodb://localhost:27017">
-                <options>
-                    <connect>true</connect>
-                </options>
-            </doctrine:connection>
-            <doctrine:connection id="conn2" server="mongodb://localhost:27017">
-                <options>
-                    <connect>true</connect>
-                </options>
-            </doctrine:connection>
-        </doctrine:connections>
-        <doctrine:document-managers>
-            <doctrine:document-manager id="dm1" metadata-cache-driver="xcache" connection="conn1" />
-            <doctrine:document-manager id="dm2" connection="conn2" />
-        </doctrine:document-managers>
+        <doctrine:connection id="conn1" server="mongodb://localhost:27017">
+            <options>
+                <connect>true</connect>
+            </options>
+        </doctrine:connection>
+        <doctrine:connection id="conn2" server="mongodb://localhost:27017">
+            <options>
+                <connect>true</connect>
+            </options>
+        </doctrine:connection>
+
+        <doctrine:document-manager id="dm1" metadata-cache-driver="xcache" connection="conn1" />
+        <doctrine:document-manager id="dm2" connection="conn2" />
     </doctrine:mongodb>
 </container>

+ 16 - 17
src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_single_connection.xml

@@ -7,22 +7,21 @@
                         http://symfony.com/schema/dic/doctrine/odm/mongodb http://symfony.com/schema/dic/doctrine/odm/mongodb/mongodb-1.0.xsd">
 
     <doctrine:mongodb>
-        <doctrine:connections>
-            <doctrine:connection id="default" server="mongodb://localhost:27017">
-                <options>
-                    <connect>true</connect>
-                </options>
-            </doctrine:connection>
-        </doctrine:connections>
-        <doctrine:document-managers>
-            <doctrine:document-manager id="default" connection="default">
-                <metadata-cache-driver type="memcache">
-                    <class>Doctrine\Common\Cache\MemcacheCache</class>
-                    <host>localhost</host>
-                    <port>11211</port>
-                    <instance-class>Memcache</instance-class>
-                </metadata-cache-driver>
-            </doctrine:document-manager>
-        </doctrine:document-managers>
+
+        <doctrine:connection id="default" server="mongodb://localhost:27017">
+            <options>
+                <connect>true</connect>
+            </options>
+        </doctrine:connection>
+
+        <doctrine:document-manager id="default" connection="default">
+            <metadata-cache-driver type="memcache">
+                <class>Doctrine\Common\Cache\MemcacheCache</class>
+                <host>localhost</host>
+                <port>11211</port>
+                <instance-class>Memcache</instance-class>
+            </metadata-cache-driver>
+        </doctrine:document-manager>
+
     </doctrine:mongodb>
 </container>