Refactor existing PersistServiceInterface and related PersistService …

…to use a generic interface; which is independent of a specific entity name

config/module.config.php

@@ -40,6 +40,7 @@
 use Arp\LaminasDoctrine\Factory\Validator\IsEntityNoMatchValidatorFactory;
 use Arp\LaminasDoctrine\Hydrator\EntityHydrator;
 use Arp\LaminasDoctrine\Repository\Persistence\PersistService;
+use Arp\LaminasDoctrine\Repository\Persistence\PersistServiceInterface;
 use Arp\LaminasDoctrine\Repository\Persistence\PersistServiceManager;
 use Arp\LaminasDoctrine\Repository\Query\QueryService;
 use Arp\LaminasDoctrine\Repository\Query\QueryServiceManager;
@@ -118,6 +119,8 @@
             // Connection
             ConnectionManager::class => ConnectionManagerInterface::class,
             ConnectionFactory::class => ConnectionFactoryInterface::class,
+
+            PersistServiceInterface::class => PersistService::class,
         ],
         'factories' => [
             // Config

src/Factory/Repository/EntityRepositoryFactory.php

@@ -7,7 +7,6 @@
 use Arp\Entity\EntityInterface;
 use Arp\LaminasDoctrine\Repository\EntityRepository;
 use Arp\LaminasDoctrine\Repository\EntityRepositoryInterface;
-use Arp\LaminasDoctrine\Repository\Persistence\PersistService;
 use Arp\LaminasDoctrine\Repository\Persistence\PersistServiceInterface;
 use Arp\LaminasDoctrine\Repository\Query\QueryService;
 use Arp\LaminasDoctrine\Repository\Query\QueryServiceInterface;
@@ -39,7 +38,7 @@ final class EntityRepositoryFactory extends AbstractFactory
             'logger' => null,
         ],
         'persist_service' => [
-            'service_name' => PersistService::class,
+            'service_name' => PersistServiceInterface::class,
             'logger' => null,
         ],
     ];
@@ -142,14 +141,14 @@ private function getPersistService(
         string $serviceName
     ): PersistServiceInterface {
         $options = array_replace_recursive(
-            $this->getServiceOptions($container, PersistService::class),
+            $this->getServiceOptions($container, PersistServiceInterface::class),
             $options
         );
         $options['entity_name'] ??= $entityName;
 
         return $this->buildService(
             $container,
-            $options['service_name'] ?? PersistService::class,
+            $options['service_name'] ?? PersistServiceInterface::class,
             $options,
             $serviceName
         );

src/Factory/Repository/Persistence/PersistServiceFactory.php

@@ -40,16 +40,6 @@ public function __invoke(
     ): PersistServiceInterface {
         $options = array_replace_recursive($this->getServiceOptions($container, $requestedName), $options ?? []);
 
-        $entityName = $options['entity_name'] ?? null;
-        if (empty($entityName)) {
-            throw new ServiceNotCreatedException(
-                sprintf(
-                    'The required \'entity_name\' configuration option is missing for service \'%s\'',
-                    $requestedName
-                )
-            );
-        }
-
         $entityManager = $options['entity_manager'] ?? null;
         if (empty($entityManager)) {
             throw new ServiceNotCreatedException(
@@ -61,7 +51,6 @@ public function __invoke(
         }
 
         return new PersistService(
-            $entityName,
             $this->getEntityManager($container, $entityManager, $requestedName),
             $this->getLogger($container, $options['logger'] ?? null, $requestedName)
         );

src/Repository/EntityRepository.php

@@ -142,6 +142,8 @@ public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @param Entity $entity
      * @param array<mixed> $options
      *
@@ -163,6 +165,8 @@ public function save(EntityInterface $entity, array $options = []): EntityInterf
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @param iterable<Entity> $collection
      * @param array<mixed> $options
      *
@@ -184,6 +188,8 @@ public function saveCollection(iterable $collection, array $options = []): itera
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @param Entity $entity
      * @param array<mixed> $options
      *
@@ -206,6 +212,8 @@ public function delete(EntityInterface $entity, array $options = []): bool
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @param iterable<int, Entity> $collection
      * @param array<mixed> $options
      *
@@ -225,6 +233,8 @@ public function deleteCollection(iterable $collection, array $options = []): int
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @throws EntityRepositoryException
      */
     public function clear(): void
@@ -241,6 +251,8 @@ public function clear(): void
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @param Entity $entity
      *
      * @throws EntityRepositoryException
@@ -262,6 +274,8 @@ public function refresh(EntityInterface $entity): void
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @throws EntityRepositoryException
      */
     public function beginTransaction(): void
@@ -278,6 +292,8 @@ public function beginTransaction(): void
     }
 
     /**
+     * @deprecated Please use the PersistServiceInterface directly
+     *
      * @throws EntityRepositoryException
      */
     public function commitTransaction(): void
@@ -293,6 +309,9 @@ public function commitTransaction(): void
         }
     }
 
+    /**
+     * @deprecated Please use the PersistServiceInterface directly
+     */
     public function rollbackTransaction(): void
     {
         $this->persistService->rollbackTransaction();