浏览代码

[DoctrineBundle] Removing old and unused services defined in xml. The services are defined in PHP extension now.

Jonathan H. Wage 15 年之前
父节点
当前提交
86b5538f01
共有 1 个文件被更改,包括 1 次插入28 次删除
  1. 1 28
      src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

+ 1 - 28
src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

@@ -41,8 +41,6 @@
     </parameters>
 
     <services>
-        <!--- Should we just move all this to php code? is it best to go one way or the other? -->
-
         <!--- Annotation Metadata Driver Service -->
         <service id="doctrine.orm.metadata_driver.annotation" class="Doctrine\ORM\Mapping\Driver\AnnotationDriver">
             <argument type="service" id="doctrine.orm.metadata_driver.annotation.reader" />
@@ -50,9 +48,6 @@
         </service>
 
         <service id="doctrine.orm.metadata_driver.annotation.reader" class="Doctrine\Common\Annotations\AnnotationReader">
-<!--
-            <argument type="service" id="doctrine.orm.cache" />
-//-->
             <call method="setDefaultAnnotationNamespace"><argument>Doctrine\ORM\Mapping\</argument></call>
         </service>
 
@@ -65,27 +60,5 @@
         <service id="doctrine.orm.metadata_driver.yml" class="Doctrine\ORM\Mapping\Driver\YamlDriver">
             <argument>%doctrine.orm.metadata_driver.mapping_dirs%</argument>
         </service>
-
-        <!--- ORM Array Cache Driver Service -->
-        <service id="doctrine.orm.cache.array" class="Doctrine\Common\Cache\ArrayCache" />
-
-        <!--- ORM APC Cache Driver Service -->
-        <service id="doctrine.orm.cache.apc" class="Doctrine\Common\Cache\ApcCache" />
-
-        <!--- ORM Memcache Cache Driver Service -->
-        <service id="doctrine.orm.cache.memcache" class="Doctrine\Common\Cache\MemcacheCache">
-            <call method="setMemcache"><argument type="service" id="doctrine.orm.cache.memcache.instance" /></call>
-        </service>
-
-        <!--- ORM Memcache Cache Driver Memcache instance. See doctrine.orm.cache.memcache -->
-        <service id="doctrine.orm.cache.memcache.instance" class="Memcache">
-            <call method="connect">
-                <argument>%doctrine.orm.cache.memcache.host%</argument>
-                <argument>%doctrine.orm.cache.memcache.port%</argument>
-            </call>
-        </service>
-
-        <!--- ORM Xcache Cache Driver Service -->
-        <service id="doctrine.orm.cache.xcache" class="Doctrine\Common\Cache\XcacheCache" />
     </services>
-</container>
+</container>