From f1cc226908e4c3e10970fad86d74aa213dfe40a0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Wed, 19 Apr 2023 12:10:41 +0200
Subject: [PATCH] Adaptation pour unicaen\console
---
composer.json | 3 ++-
config/merged/synchronisation.config.php | 2 +-
config/module.config.php | 2 +-
.../Controller/SynchronisationConsoleController.php | 3 +--
.../Service/Synchronisation/SynchronisationServiceFactory.php | 3 ++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index 25ec4f7..ede4911 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 31f4a44..bb5c959 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 e9805c3..9a24480 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 03eff60..584bbc9 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 341b8e1..fa2baa1 100644
--- a/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php
+++ b/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php
@@ -23,7 +23,8 @@ class SynchronisationServiceFactory {
* @var EntityManager $destination
* @var SqlHelperService $sqlHelper
*/
- $source = $container->get('doctrine.entitymanager.orm_octopus');
+// $source = $container->get('doctrine.entitymanager.orm_octopus');
+ $source = $container->get('doctrine.entitymanager.orm_default');
$destination = $container->get('doctrine.entitymanager.orm_default');
$entityManagers = [
'orm_octopus' => $source,
--
GitLab