From 21ff19bb3d97eefc25fa6b153cea01f0610ae2c5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Fri, 28 Jul 2023 08:38:15 +0200
Subject: [PATCH] Up
---
.../SynchronisationConsoleController.php | 1 +
...ynchronisationConsoleControllerFactory.php | 0
.../Entity/Db/IsSynchronisableInterface.php | 0
.../Entity/Db/IsSynchronisableTrait.php | 0
.../Entity/Db/Mapping/placeholder.txt | 0
Module.php => UnicaenSynchro/Module.php | 10 ++++---
.../Service/SqlHelper/SqlHelperService.php | 0
.../SqlHelper/SqlHelperServiceAwareTrait.php | 0
.../SqlHelper/SqlHelperServiceFactory.php | 0
.../SynchronisationService.php | 0
.../SynchronisationServiceAwareTrait.php | 0
.../SynchronisationServiceFactory.php | 0
composer.json | 4 +--
config/merged/sql-helper.config.php | 20 --------------
config/module.config.php | 9 +------
readme.md | 27 +++++++++++++++++--
16 files changed, 36 insertions(+), 35 deletions(-)
rename {src/UnicaenSynchro => UnicaenSynchro}/Controller/SynchronisationConsoleController.php (92%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Controller/SynchronisationConsoleControllerFactory.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Entity/Db/IsSynchronisableInterface.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Entity/Db/IsSynchronisableTrait.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Entity/Db/Mapping/placeholder.txt (100%)
rename Module.php => UnicaenSynchro/Module.php (77%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Service/SqlHelper/SqlHelperService.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Service/SqlHelper/SqlHelperServiceAwareTrait.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Service/SqlHelper/SqlHelperServiceFactory.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Service/Synchronisation/SynchronisationService.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Service/Synchronisation/SynchronisationServiceAwareTrait.php (100%)
rename {src/UnicaenSynchro => UnicaenSynchro}/Service/Synchronisation/SynchronisationServiceFactory.php (100%)
diff --git a/src/UnicaenSynchro/Controller/SynchronisationConsoleController.php b/UnicaenSynchro/Controller/SynchronisationConsoleController.php
similarity index 92%
rename from src/UnicaenSynchro/Controller/SynchronisationConsoleController.php
rename to UnicaenSynchro/Controller/SynchronisationConsoleController.php
index 584bbc9..ea4d1c0 100644
--- a/src/UnicaenSynchro/Controller/SynchronisationConsoleController.php
+++ b/UnicaenSynchro/Controller/SynchronisationConsoleController.php
@@ -17,6 +17,7 @@ class SynchronisationConsoleController extends AbstractConsoleController {
public function synchroniserAllAction() : string
{
+ // todo utiliser l'ordre pour executer les synchros dans le bon sens
$jobs = $this->configs;
// usort($works, function ($a,$b) { return $a['order'] > $b['order'];});
foreach ($jobs as $name => $job) {
diff --git a/src/UnicaenSynchro/Controller/SynchronisationConsoleControllerFactory.php b/UnicaenSynchro/Controller/SynchronisationConsoleControllerFactory.php
similarity index 100%
rename from src/UnicaenSynchro/Controller/SynchronisationConsoleControllerFactory.php
rename to UnicaenSynchro/Controller/SynchronisationConsoleControllerFactory.php
diff --git a/src/UnicaenSynchro/Entity/Db/IsSynchronisableInterface.php b/UnicaenSynchro/Entity/Db/IsSynchronisableInterface.php
similarity index 100%
rename from src/UnicaenSynchro/Entity/Db/IsSynchronisableInterface.php
rename to UnicaenSynchro/Entity/Db/IsSynchronisableInterface.php
diff --git a/src/UnicaenSynchro/Entity/Db/IsSynchronisableTrait.php b/UnicaenSynchro/Entity/Db/IsSynchronisableTrait.php
similarity index 100%
rename from src/UnicaenSynchro/Entity/Db/IsSynchronisableTrait.php
rename to UnicaenSynchro/Entity/Db/IsSynchronisableTrait.php
diff --git a/src/UnicaenSynchro/Entity/Db/Mapping/placeholder.txt b/UnicaenSynchro/Entity/Db/Mapping/placeholder.txt
similarity index 100%
rename from src/UnicaenSynchro/Entity/Db/Mapping/placeholder.txt
rename to UnicaenSynchro/Entity/Db/Mapping/placeholder.txt
diff --git a/Module.php b/UnicaenSynchro/Module.php
similarity index 77%
rename from Module.php
rename to UnicaenSynchro/Module.php
index 81fb57b..b062ac5 100644
--- a/Module.php
+++ b/UnicaenSynchro/Module.php
@@ -2,6 +2,7 @@
namespace UnicaenSynchro;
+use Laminas\Config\Config;
use Laminas\Mvc\ModuleRouteListener;
use Laminas\Mvc\MvcEvent;
use Laminas\Config\Factory as ConfigFactory;
@@ -10,14 +11,16 @@ use Laminas\Stdlib\Glob;
class Module
{
- public function onBootstrap(MvcEvent $e)
+ /** @noinspection PhpUnused */
+ public function onBootstrap(MvcEvent $e): void
{
$eventManager = $e->getApplication()->getEventManager();
$moduleRouteListener = new ModuleRouteListener();
$moduleRouteListener->attach($eventManager);
}
- public function getConfig()
+ /** @noinspection PhpUnused */
+ public function getConfig(): array|Config
{
$configInit = [
__DIR__ . '/config/module.config.php'
@@ -30,7 +33,8 @@ class Module
return ConfigFactory::fromFiles($configFiles);
}
- public function getAutoloaderConfig()
+ /** @noinspection PhpUnused */
+ public function getAutoloaderConfig(): array
{
return array(
'Laminas\Loader\StandardAutoloader' => array(
diff --git a/src/UnicaenSynchro/Service/SqlHelper/SqlHelperService.php b/UnicaenSynchro/Service/SqlHelper/SqlHelperService.php
similarity index 100%
rename from src/UnicaenSynchro/Service/SqlHelper/SqlHelperService.php
rename to UnicaenSynchro/Service/SqlHelper/SqlHelperService.php
diff --git a/src/UnicaenSynchro/Service/SqlHelper/SqlHelperServiceAwareTrait.php b/UnicaenSynchro/Service/SqlHelper/SqlHelperServiceAwareTrait.php
similarity index 100%
rename from src/UnicaenSynchro/Service/SqlHelper/SqlHelperServiceAwareTrait.php
rename to UnicaenSynchro/Service/SqlHelper/SqlHelperServiceAwareTrait.php
diff --git a/src/UnicaenSynchro/Service/SqlHelper/SqlHelperServiceFactory.php b/UnicaenSynchro/Service/SqlHelper/SqlHelperServiceFactory.php
similarity index 100%
rename from src/UnicaenSynchro/Service/SqlHelper/SqlHelperServiceFactory.php
rename to UnicaenSynchro/Service/SqlHelper/SqlHelperServiceFactory.php
diff --git a/src/UnicaenSynchro/Service/Synchronisation/SynchronisationService.php b/UnicaenSynchro/Service/Synchronisation/SynchronisationService.php
similarity index 100%
rename from src/UnicaenSynchro/Service/Synchronisation/SynchronisationService.php
rename to UnicaenSynchro/Service/Synchronisation/SynchronisationService.php
diff --git a/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceAwareTrait.php b/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceAwareTrait.php
similarity index 100%
rename from src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceAwareTrait.php
rename to UnicaenSynchro/Service/Synchronisation/SynchronisationServiceAwareTrait.php
diff --git a/src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php b/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php
similarity index 100%
rename from src/UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php
rename to UnicaenSynchro/Service/Synchronisation/SynchronisationServiceFactory.php
diff --git a/composer.json b/composer.json
index ede4911..f601649 100755
--- a/composer.json
+++ b/composer.json
@@ -8,13 +8,13 @@
}
],
"require": {
- "unicaen/privilege": "^5|^6",
+ "unicaen/privilege": "^6",
"unicaen/console": "^6"
},
"autoload": {
"psr-0": [],
"classmap": [
- "./Module.php"
+ "./UnicaenSynchro/Module.php"
]
}
}
diff --git a/config/merged/sql-helper.config.php b/config/merged/sql-helper.config.php
index 3e9f4e5..34d38d5 100644
--- a/config/merged/sql-helper.config.php
+++ b/config/merged/sql-helper.config.php
@@ -6,29 +6,9 @@ use UnicaenSynchro\Service\SqlHelper\SqlHelperService;
use UnicaenSynchro\Service\SqlHelper\SqlHelperServiceFactory;
return [
- 'bjyauthorize' => [
- 'guards' => [
- ],
- ],
-
- 'router' => [
- 'routes' => [
- ],
- ],
-
'service_manager' => [
'factories' => [
SqlHelperService::class => SqlHelperServiceFactory::class
],
],
- 'controllers' => [
- 'factories' => [],
- ],
- 'form_elements' => [
- 'factories' => [],
- ],
- 'hydrators' => [
- 'factories' => [],
- ]
-
];
\ No newline at end of file
diff --git a/config/module.config.php b/config/module.config.php
index 9a24480..8dab2f5 100755
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -4,16 +4,9 @@ namespace UnicaenSynchro;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
-use UnicaenPrivilege\Guard\PrivilegeController;
return [
- 'bjyauthorize' => [
- 'guards' => [
- PrivilegeController::class => [
- ],
- ],
- ],
-
+ /** Conserver la partie doctrine pour les "futurs" log de synchro */
'doctrine' => [
'driver' => [
'orm_default' => [
diff --git a/readme.md b/readme.md
index 9234975..e55ccc7 100644
--- a/readme.md
+++ b/readme.md
@@ -10,9 +10,32 @@ Le module **unicaen/synchro** est en charge
Description du fonctionnement
============================
-Tables pour les données du modules
+Fichier de configuration
+========================
+
+
+
+Tables pour les données du module
==================================
-Dépendances extérieurs
+Aucune pour le moment, car aucun log n'est enregistré !
+
+Dépendances extérieures
======================
+UnicaenPrivilege
+Unicaen\Console
+
+Versions
+========
+
+**6.0.3**
+- Correction de l'interface/trait `IsSynchronisableInterface` et `IsSynchronisableTrait`
+- Début de documentation
+
+Futures améliorations
+=====================
+
+- Log de synchronisation
+- Utilisation de la clef ordre pour l'execution des synchronisations `synchroniser-all`
+- Changement de la clef id pour clef primaire ou quelque chose du genre
--
GitLab