Load entity repository from AdminController with the repository_service_id

Author: david

src/LIN3S/AdminBundle/Configuration/Factory/EntityConfigurationFactory.php

@@ -16,6 +16,7 @@
 use LIN3S\AdminBundle\Configuration\Model\ListField;
 use LIN3S\AdminBundle\Configuration\Model\ListFilter;
 use LIN3S\AdminBundle\Registry\ServiceRegistry;
+use LIN3S\AdminBundle\Repository\AdminRepository;
 use LIN3S\AdminBundle\Repository\AdminRepositoryFactory;
 
 final class EntityConfigurationFactory
@@ -24,20 +25,17 @@ final class EntityConfigurationFactory
     private $actions;
     private $listFields;
     private $listFilters;
-    private $repositoryFactory;
 
     public function __construct(
         $config,
         ServiceRegistry $actions,
         ServiceRegistry $listFields,
-        ServiceRegistry $listFilters,
-        AdminRepositoryFactory $repositoryFactory
+        ServiceRegistry $listFilters
     ) {
         $this->config = $config['entities'];
         $this->actions = $actions;
         $this->listFields = $listFields;
         $this->listFilters = $listFilters;
-        $this->repositoryFactory = $repositoryFactory;
     }
 
     public function createFor($entity)
@@ -52,7 +50,7 @@ public function createFor($entity)
             $this->listFieldsForEntity($entity),
             $this->listFiltersForEntity($entity),
             $entityConfig['list']['global_actions'],
-            $this->repositoryFactory->build($entityConfig['persistence_strategy']),
+            $entityConfig['repository_service_id'],
             $entityConfig['name'],
             $entityConfig['list']['amount_per_page'],
             $entityConfig['list']['order_by']

src/LIN3S/AdminBundle/Configuration/Model/Entity.php

@@ -28,7 +28,7 @@ final class Entity
     private $listGlobalActions;
     private $listOrderByDefault;
     private $printNames;
-    private $repository;
+    private $repositoryServiceId;
 
     public function __construct(
         $name,
@@ -38,7 +38,7 @@ public function __construct(
         array $listFields = [],
         array $listFilters = [],
         array $listGlobalActions = [],
-        AdminRepository $repository,
+        $repositoryServiceId,
         array $printNames,
         $listEntitiesPerPage,
         array $listOrderByDefault = []
@@ -51,7 +51,7 @@ public function __construct(
         $this->actions = $actions;
         $this->listActions = $listActions;
         $this->listGlobalActions = $listGlobalActions;
-        $this->repository = $repository;
+        $this->repositoryServiceId = $repositoryServiceId;
         $this->printNames = $printNames;
         $this->listEntitiesPerPage = $listEntitiesPerPage;
         $this->listOrderByDefault = $listOrderByDefault;
@@ -282,12 +282,12 @@ public function printNames()
     }
 
     /**
-     * Gets the query builder.
+     * Gets the repository service id.
      *
-     * @return AdminRepository
+     * @return string
      */
-    public function repository()
+    public function repositoryServiceId()
     {
-        return $this->repository;
+        return $this->repositoryServiceId;
     }
 }

src/LIN3S/AdminBundle/Controller/AdminController.php

@@ -32,7 +32,7 @@ class AdminController extends Controller
     public function listAction($entity, Request $request)
     {
         $entityConfig = $this->get('lin3s_admin.configuration.factory.entity')->createFor($entity);
-        $repository = $entityConfig->repository();
+        $repository = $this->get($entityConfig->repositoryServiceId());
         $entities = $repository->findByRequest($request, $entityConfig);
         $totalCount = $repository->countAll($request, $entityConfig);
 
@@ -58,7 +58,7 @@ public function customAction($entity, $action, $id = null, Request $request)
         $entityConfig = $this->get('lin3s_admin.configuration.factory.entity')->createFor($entity);
         $entityObject = null;
         if ($id) {
-            $entityObject = $entityConfig->repository()->find($entityConfig, $id);
+            $entityObject = $this->get($entityConfig->repositoryServiceId())->find($entityConfig, $id);
         }
         if ($id && !$entityObject) {
             throw $this->createNotFoundException(

src/LIN3S/AdminBundle/DependencyInjection/Configuration.php

@@ -32,8 +32,8 @@ public function getConfigTreeBuilder()
                 ->arrayNode('entities')->requiresAtLeastOneElement()
                 ->prototype('array')
                     ->children()
-                        ->scalarNode('persistence_strategy')
-                            ->defaultValue('doctrine')
+                        ->scalarNode('repository_service_id')
+                            ->defaultValue('lin3s_admin.doctrine_repository')
                         ->end()
                         ->arrayNode('name')
                             ->children()

src/LIN3S/AdminBundle/Repository/AdminRepositoryFactory.php

@@ -22,7 +22,6 @@ services:
             - '@lin3s_admin.action.registry'
             - '@lin3s_admin.list_field_type.registry'
             - '@lin3s_admin.list_filter_type.registry'
-            - '@lin3s_admin.repository_factory'
 
     lin3s_admin.form.handler:
         class: LIN3S\AdminBundle\Form\FormHandler

src/LIN3S/AdminBundle/Repository/PdoAdminRepository.php

@@ -15,15 +15,3 @@ services:
         class: LIN3S\AdminBundle\Repository\DoctrineAdminRepository
         arguments:
             - '@doctrine.orm.entity_manager'
-
-    lin3s_admin.pdo_repository:
-        class: LIN3S\AdminBundle\Repository\PdoAdminRepository
-        arguments:
-            - '@lin3s_admin.pdo'
-
-    lin3s_admin.repository_factory:
-        class: LIN3S\AdminBundle\Repository\AdminRepositoryFactory
-        arguments:
-            -
-                pdo: '@lin3s_admin.pdo_repository'
-                doctrine: '@lin3s_admin.doctrine_repository'