Commit 6ce53e61 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch '6.x'

parents 79cfbf05 8533b13f
Loading
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@
        }
    ],
    "require": {
        "unicaen/privilege": "^5||^6"
        "unicaen/privilege": "^5|^6",
        "unicaen/console": "^6"
    },
    "autoload": {
        "psr-0": [],
+1 −1
Original line number Diff line number Diff line
@@ -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;
+1 −1
Original line number Diff line number Diff line
@@ -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 [
+1 −2
Original line number Diff line number Diff line
@@ -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 {
+8 −12
Original line number Diff line number Diff line
@@ -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();