Merge pull request #592 from doctrine/projects-orm

Replace skeleton mapper with orm for Projects
doctrine · Jul 19, 2024 · d37cb5b · d37cb5b
2 parents 9793160 + 69c9777
commit d37cb5b
Show file tree

Hide file tree

Showing 29 changed files with 1,157 additions and 995 deletions.
diff --git a/config/services.xml b/config/services.xml
@@ -87,25 +87,6 @@
         </service>
         <service id="Doctrine\SkeletonMapper\Persister\ObjectPersisterFactory" autowire="false" />
 
-        <service id="Doctrine\Website\Repositories\BlogPostRepository" autowire="false">
-            <argument type="service" id="Doctrine\SkeletonMapper\ObjectManager" />
-            <argument type="service">
-                <service class="Doctrine\SkeletonMapper\DataSource\DataSourceObjectDataRepository" autowire="false">
-                    <argument type="service" id="Doctrine\SkeletonMapper\ObjectManager" />
-                    <argument type="service" id="Doctrine\Website\DataSources\BlogPosts" />
-                    <argument>Doctrine\Website\Model\BlogPost</argument>
-                </service>
-            </argument>
-            <argument type="service" id="Doctrine\SkeletonMapper\ObjectFactory" />
-            <argument type="service">
-                <service class="Doctrine\Website\Hydrators\BlogPostHydrator">
-                    <argument type="service" id="Doctrine\SkeletonMapper\ObjectManager" />
-                </service>
-            </argument>
-            <argument type="service" id="Doctrine\Common\EventManager" />
-            <argument>Doctrine\Website\Model\BlogPost</argument>
-        </service>
-
         <service id="Doctrine\Website\Repositories\BlogPostRepository" autowire="false" public="true">
             <factory service="Doctrine\ORM\EntityManagerInterface" method="getRepository" />
             <argument type="string">Doctrine\Website\Model\BlogPost</argument>
@@ -140,22 +121,8 @@
         </service>
 
         <service id="Doctrine\Website\Repositories\ProjectRepository" autowire="false" public="true">
-            <argument type="service" id="Doctrine\SkeletonMapper\ObjectManager" />
-            <argument type="service">
-                <service class="Doctrine\SkeletonMapper\DataSource\DataSourceObjectDataRepository" autowire="false">
-                    <argument type="service" id="Doctrine\SkeletonMapper\ObjectManager" />
-                    <argument type="service" id="Doctrine\Website\DataSources\Projects" />
-                    <argument>Doctrine\Website\Model\Project</argument>
-                </service>
-            </argument>
-            <argument type="service" id="Doctrine\SkeletonMapper\ObjectFactory" />
-            <argument type="service">
-                <service class="Doctrine\Website\Hydrators\ProjectHydrator">
-                    <argument type="service" id="Doctrine\SkeletonMapper\ObjectManager" />
-                </service>
-            </argument>
-            <argument type="service" id="Doctrine\Common\EventManager" />
-            <argument>Doctrine\Website\Model\Project</argument>
+            <factory service="Doctrine\ORM\EntityManagerInterface" method="getRepository" />
+            <argument type="string">Doctrine\Website\Model\Project</argument>
         </service>
 
         <service id="Doctrine\Website\Repositories\SitemapPageRepository" autowire="false">
@@ -168,11 +135,6 @@
                 <argument>Doctrine\Website\Model\Partner</argument>
                 <argument type="service" id="Doctrine\Website\Repositories\PartnerRepository" />
             </call>
-
-            <call method="addObjectRepository">
-                <argument>Doctrine\Website\Model\Project</argument>
-                <argument type="service" id="Doctrine\Website\Repositories\ProjectRepository" />
-            </call>
         </service>
 
         <service id="Doctrine\SkeletonMapper\ObjectManager" autowire="false">
@@ -210,5 +172,12 @@
             <argument type="service" id="Doctrine\ORM\EntityManagerInterface" />
             <tag name="doctrine.website.db_prefill" />
         </service>
+
+        <service id="doctrine.website.data_sources.db_prefill.projects"
+                 class="Doctrine\Website\DataSources\DbPrefill\Projects">
+            <argument type="service" id="Doctrine\Website\DataSources\Projects" />
+            <argument type="service" id="Doctrine\ORM\EntityManagerInterface" />
+            <tag name="doctrine.website.db_prefill" />
+        </service>
     </services>
 </container>
diff --git a/config/services/orm.xml b/config/services/orm.xml
@@ -8,6 +8,8 @@
             <factory class="Doctrine\ORM\ORMSetup" method="createAttributeMetadataConfiguration" />
             <argument type="collection">
                 <argument type="string">lib/Model</argument>
+                <argument type="string">lib/Git</argument>
+                <argument type="string">lib/Docs/RST</argument>
             </argument>
         </service>
 
@@ -24,6 +26,6 @@
             <argument type="service" id="Doctrine\ORM\Configuration" />
         </service>
 
-        <service alias="Doctrine\ORM\EntityManager" id="Doctrine\ORM\EntityManagerInterface" />
+        <service alias="Doctrine\ORM\EntityManager" id="Doctrine\ORM\EntityManagerInterface" public="true" />
     </services>
 </container>
diff --git a/lib/DataBuilder/ProjectDataBuilder.php b/lib/DataBuilder/ProjectDataBuilder.php