diff --git a/composer.json b/composer.json index 25ec4f7111477447d916186d76c04580b480aca5..ede4911168ebfc72e1957abb6e0c5c8756d56253 100755 --- a/composer.json +++ b/composer.json @@ -8,7 +8,8 @@ } ], "require": { - "unicaen/privilege": "^5||^6" + "unicaen/privilege": "^5|^6", + "unicaen/console": "^6" }, "autoload": { "psr-0": [], diff --git a/config/merged/synchronisation.config.php b/config/merged/synchronisation.config.php index 31f4a444a77ec169fc101b2078600f65ab788f69..bb5c959e2917a0188d4c8adec39c30fe049a62a8 100644 --- a/config/merged/synchronisation.config.php +++ b/config/merged/synchronisation.config.php @@ -2,7 +2,7 @@ namespace UnicaenSynchro; -use Laminas\Mvc\Console\Router\Simple; +use Unicaen\Console\Router\Simple; use UnicaenSynchro\Controller\SynchronisationConsoleController; use UnicaenSynchro\Controller\SynchronisationConsoleControllerFactory; use UnicaenSynchro\Service\Synchronisation\SynchronisationService; diff --git a/config/module.config.php b/config/module.config.php index e9805c307a8344ac42b4a8906b426a8293bcb786..9a24480ed5206ad948a985668449d9f8184a7446 100755 --- a/config/module.config.php +++ b/config/module.config.php @@ -2,8 +2,8 @@ namespace UnicaenSynchro; -use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\ORM\Mapping\Driver\XmlDriver; +use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use UnicaenPrivilege\Guard\PrivilegeController; return [ diff --git a/src/UnicaenSynchro/Controller/SynchronisationConsoleController.php b/src/UnicaenSynchro/Controller/SynchronisationConsoleController.php index 03eff60075a34d0aec4ef27885fccd462d691be7..584bbc985157c3b01e1716fc3f0a0bd22f2db092 100644 --- a/src/UnicaenSynchro/Controller/SynchronisationConsoleController.php +++ b/src/UnicaenSynchro/Controller/SynchronisationConsoleController.php @@ -2,8 +2,7 @@ namespace UnicaenSynchro\Controller; -use Laminas\Mvc\Console\Controller\AbstractConsoleController; -use Laminas\Mvc\Controller\AbstractActionController; +use Unicaen\Console\Controller\AbstractConsoleController; use UnicaenSynchro\Service\Synchronisation\SynchronisationServiceAwareTrait; class SynchronisationConsoleController extends AbstractConsoleController { diff --git a/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php b/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php index 341b8e17fe9eac1c881b839856ea602c2d1de9f2..c244998f23fe926d1735fa3d59b7c1d5f0c83446 100644 --- a/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php +++ b/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php @@ -18,19 +18,15 @@ class SynchronisationServiceFactory { */ public function __invoke(ContainerInterface $container) : SynchronisationService { - /** - * @var EntityManager $source - * @var EntityManager $destination - * @var SqlHelperService $sqlHelper - */ - $source = $container->get('doctrine.entitymanager.orm_octopus'); - $destination = $container->get('doctrine.entitymanager.orm_default'); - $entityManagers = [ - 'orm_octopus' => $source, - 'orm_default' => $destination, - ]; - $sqlHelper = $container->get(SqlHelperService::class); + // récupération des entity managers déclarés + $sources = $container->get('Config')['doctrine']['entitymanager']; + $entityManagers = []; + foreach ($sources as $id => $data) { + $entityManagers[$id] = $container->get('doctrine.entitymanager.'. $id); + } + /** @var SqlHelperService $sqlHelper */ + $sqlHelper = $container->get(SqlHelperService::class); $configs = $container->get('Config')['synchros']; $service = new SynchronisationService();