diff --git a/module/Agent/src/Service/Agent/AgentService.php b/module/Agent/src/Service/Agent/AgentService.php
index e93526ddf17832e05fc404dea80237f042937651..ef739346f77330279d0b0fa856f0b2e4263f6a82 100644
--- a/module/Agent/src/Service/Agent/AgentService.php
+++ b/module/Agent/src/Service/Agent/AgentService.php
@@ -282,12 +282,6 @@ EOS;
->setParameter('structures', $structures);
}
-// $structuresIds = array_map(function (Structure $structure) {return $structure->getId();}, $structures);
-// var_dump(implode(',', $structuresIds));
-// $sql = $qb->getQuery()->getSQL();
-// var_dump($sql);
-// die();
-
$result = $qb->getQuery()->getResult();
return $result;
diff --git a/module/Agent/src/View/Helper/AgentAffectationViewHelper.php b/module/Agent/src/View/Helper/AgentAffectationViewHelper.php
index 02e8c9b9f9456894d0570dcb36a917202cf6957c..2e02f27b8a1858bf630abe4834915d38f912c695 100644
--- a/module/Agent/src/View/Helper/AgentAffectationViewHelper.php
+++ b/module/Agent/src/View/Helper/AgentAffectationViewHelper.php
@@ -10,11 +10,11 @@ use Laminas\View\Resolver\TemplatePathStack;
/**
* Note : les clefs du tableau options sont les suivantes :
- * id => l'identifiant du status (OSE-2017-17566-14)
- * denomination => le nom de l'agent impliqué (Billy Bob)
- * structure => la structure impliquée (DSI)
- * periode => la periode (01/01/2001 => 06/06/2006)
- * statut => la liste des statuts
+ * id : l'identifiant du status (OSE-2017-17566-14)
+ * denomination : le nom de l'agent impliqué (Billy Bob)
+ * structure : la structure impliquée (DSI)
+ * periode : la periode (01/01/2001 => 06/06/2006)
+ * statut : la liste des statuts
*
* si non défini ou à vrai alors les données sont affichées
*/
diff --git a/module/Agent/src/View/Helper/AgentGradeViewHelper.php b/module/Agent/src/View/Helper/AgentGradeViewHelper.php
index 33ac83562475bf41b842061929ec904dc3ec8c2b..6ef5d118478b6f95d1ba89751a79bd1c50d6fd6f 100644
--- a/module/Agent/src/View/Helper/AgentGradeViewHelper.php
+++ b/module/Agent/src/View/Helper/AgentGradeViewHelper.php
@@ -16,7 +16,7 @@ use Laminas\View\Resolver\TemplatePathStack;
* grade
* corps
* bap
- * periode : la periode (01/01/2001 => 06/06/2006)
+ * periode : la periode (01/01/2001 au 06/06/2006)
* si non défini ou à vrai alors les données sont affichées
*/
class AgentGradeViewHelper extends AbstractHelper
diff --git a/module/Agent/src/View/Helper/AgentStatutViewHelper.php b/module/Agent/src/View/Helper/AgentStatutViewHelper.php
index a86028ef4cf94ceb045aaafeb8edafa6c6f69dcf..824e8493c5de0e7834e1698701081de7586e4b16 100644
--- a/module/Agent/src/View/Helper/AgentStatutViewHelper.php
+++ b/module/Agent/src/View/Helper/AgentStatutViewHelper.php
@@ -11,11 +11,11 @@ use Laminas\View\Resolver\TemplatePathStack;
/**
* Note : les clefs du tableau options sont les suivantes :
- * id => l'identifiant du status (OSE-2017-17566-14)
- * denomination => le nom de l'agent impliqué (Billy Bob)
- * structure => la structure impliquée (DSI)
- * periode => la periode (01/01/2001 => 06/06/2006)
- * statut => la liste des statuts
+ * id : l'identifiant du status (OSE-2017-17566-14)
+ * denomination : le nom de l'agent impliqué (Billy Bob)
+ * structure : la structure impliquée (DSI)
+ * periode : la periode (01/01/2001 => 06/06/2006)
+ * statut : la liste des statuts
*
* si non défini ou à vrai alors les données sont affichées
*/
diff --git a/module/Agent/view/agent/agent/afficher.phtml b/module/Agent/view/agent/agent/afficher.phtml
index 18e8b372c199991c2e3e604ba73facd90a94fa9e..9a29832184ada0f85e40051a56130082eb339018 100644
--- a/module/Agent/view/agent/agent/afficher.phtml
+++ b/module/Agent/view/agent/agent/afficher.phtml
@@ -53,7 +53,7 @@ $canModifier = $this->isAllowed(AgentPrivileges::getResourceId(AgentPrivileges::
<li>
<?php
$structure = $agentAffectation->getStructure();
- $niveau2 = $structure ? $structure->getNiv2() : null;
+ $niveau2 = $structure?->getNiv2();
?>
<?php if ($structure) : ?>
<?php echo $structure->getLibelleLong(); ?>
diff --git a/module/Application/view/application/verification/infos.phtml b/module/Application/view/application/verification/infos.phtml
index 2eb69ff69b191ca66a15d1dc85d6dc5c814cceb4..f35a8efd67986767cdb3e468efecb11f340720eb 100644
--- a/module/Application/view/application/verification/infos.phtml
+++ b/module/Application/view/application/verification/infos.phtml
@@ -1,3 +1,3 @@
<?php
-phpinfo(); ?><docke></docke>
\ No newline at end of file
+phpinfo();
\ No newline at end of file
diff --git a/module/Carriere/config/merged/niveau.config.php b/module/Carriere/config/merged/niveau.config.php
index 24d32e5d6430a3f372478c55f8601a66d34971d2..984979289ea2e81e3ab0ed2c2894147486da00e2 100644
--- a/module/Carriere/config/merged/niveau.config.php
+++ b/module/Carriere/config/merged/niveau.config.php
@@ -76,27 +76,6 @@ return [
],
],
-// 'navigation' => [
-// 'default' => [
-// 'home' => [
-// 'pages' => [
-// 'ressource' => [
-// 'pages' => [
-// 'niveau' => [
-// 'label' => 'Niveaux de carrière',
-// 'route' => 'niveau',
-// 'resource' => PrivilegeController::getResourceId(NiveauController::class, 'index') ,
-// 'order' => 2500,
-// 'pages' => [],
-// 'icon' => 'fas fa-angle-right',
-// ],
-// ],
-// ],
-// ],
-// ],
-// ],
-// ],
-
'router' => [
'routes' => [
'niveau' => [
diff --git a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Categorie.dcm.xml b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Categorie.dcm.xml
index eb4bddb97bdc23a5fe76adae7569767d1024776b..8e03219ac08e594afa90ec62e4cdaf57917b68cc 100644
--- a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Categorie.dcm.xml
+++ b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Categorie.dcm.xml
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Carriere\Entity\Db\Categorie" table="carriere_categorie">
<id name="id" type="integer" column="id">
<generator strategy="IDENTITY"/>
</id>
- <field name="code" type="string" length="255" column="code" nullable="false"/>
- <field name="libelle" type="string" length="1024" column="libelle" nullable="false"/>
+ <field name="code" length="255" column="code" />
+ <field name="libelle" length="1024" column="libelle" />
<one-to-many field="metiers" target-entity="Metier\Entity\Db\Metier" mapped-by="categorie"/>
<!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
- <field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
- <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
+ <field name="histoCreation" type="datetime" column="histo_creation" />
+ <field name="histoModification" type="datetime" column="histo_modification" />
+ <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
diff --git a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Corps.dcm.xml b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Corps.dcm.xml
index c03dcd1a2206891d5169deba94f9b0a3c41eab3e..8cc05bf25f5609705a6bad8b3be8d0f2e85c12f0 100644
--- a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Corps.dcm.xml
+++ b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Corps.dcm.xml
@@ -1,29 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Carriere\Entity\Db\Corps" table="carriere_corps">
- <id name="id" column="id" type="integer">
+ <id name="id" column="id" type="integer">
</id>
- <field name="libelleCourt" column="lib_court" type="string" length="20" />
- <field name="libelleLong" column="lib_long" type="string" length="200" />
- <field name="code" column="code" type="string" length="10" />
- <field name="categorie" column="categorie" type="string" length="10" />
- <field name="dateDebut" column="d_ouverture" type="datetime" />
- <field name="dateFin" column="d_fermeture" type="datetime" />
+ <field name="libelleCourt" column="lib_court" length="20"/>
+ <field name="libelleLong" column="lib_long" length="200"/>
+ <field name="code" column="code" length="10"/>
+ <field name="categorie" column="categorie" length="10"/>
+ <field name="dateDebut" column="d_ouverture" type="datetime"/>
+ <field name="dateFin" column="d_fermeture" type="datetime"/>
- <field name="superieurAsAutorite" column="superieur_as_autorite" type="boolean" />
+ <field name="superieurAsAutorite" column="superieur_as_autorite" type="boolean"/>
- <many-to-one target-entity="Carriere\Entity\Db\NiveauEnveloppe" field="niveaux">
- <join-column name="niveaux_id" referenced-column-name="id"/>
+ <many-to-one target-entity="Carriere\Entity\Db\NiveauEnveloppe" field="niveaux">
+ <join-column name="niveaux_id" />
</many-to-one>
<one-to-many field="agentGrades" target-entity="Agent\Entity\Db\AgentGrade" mapped-by="corps"/>
<!-- DB IMPORT ############################# -->
- <field name="createdOn" column="created_on" type="datetime"/>
- <field name="updatedOn" column="updated_on" type="datetime"/>
- <field name="deletedOn" column="deleted_on" type="datetime"/>
- <field name="sourceId" column="source_id" length="128"/>
+ <field name="createdOn" column="created_on" type="datetime"/>
+ <field name="updatedOn" column="updated_on" type="datetime"/>
+ <field name="deletedOn" column="deleted_on" type="datetime"/>
+ <field name="sourceId" column="source_id" length="128"/>
</entity>
</doctrine-mapping>
diff --git a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.CorrespondanceType.dcm.xml b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.CorrespondanceType.dcm.xml
index d8f2c5d44b833ef77d432c2b4b4119fbd8253ed9..f8153a6047496aaecc707d53fa0332612942dca6 100644
--- a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.CorrespondanceType.dcm.xml
+++ b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.CorrespondanceType.dcm.xml
@@ -1,23 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Carriere\Entity\Db\CorrespondanceType" table="carriere_correspondance_type">
- <id name="id" column="id" type="integer">
+ <id name="id" column="id" type="integer">
</id>
- <field name="code" column="code" type="string" length="64" />
- <field name="libelleCourt" column="libelle_court" type="string" length="256" />
- <field name="libelleLong" column="libelle_long" type="string" length="1024" />
- <field name="description" column="description" type="string" length="9999" />
- <field name="dateOuverture" column="d_ouverture" type="datetime" />
- <field name="dateFermeture" column="d_fermeture" type="datetime" />
+ <field name="code" column="code" length="64"/>
+ <field name="libelleCourt" column="libelle_court" length="256"/>
+ <field name="libelleLong" column="libelle_long" length="1024"/>
+ <field name="description" column="description" length="9999"/>
+ <field name="dateOuverture" column="d_ouverture" type="datetime"/>
+ <field name="dateFermeture" column="d_fermeture" type="datetime"/>
<one-to-many field="correspondances" target-entity="Carriere\Entity\Db\Correspondance" mapped-by="type"/>
<!-- DB IMPORT ############################# -->
- <field name="createdOn" column="created_on" type="datetime"/>
- <field name="updatedOn" column="updated_on" type="datetime"/>
- <field name="deletedOn" column="deleted_on" type="datetime"/>
- <field name="sourceId" column="source_id" length="128"/>
+ <field name="createdOn" column="created_on" type="datetime"/>
+ <field name="updatedOn" column="updated_on" type="datetime"/>
+ <field name="deletedOn" column="deleted_on" type="datetime"/>
+ <field name="sourceId" column="source_id" length="128"/>
</entity>
</doctrine-mapping>
diff --git a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.EmploiType.dcm.xml b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.EmploiType.dcm.xml
index 09947a8abfa96e191bcd8a85c395ef6a2b59fc12..70c2e3a585a2a94e44fc615b5b0e016e4c725202 100644
--- a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.EmploiType.dcm.xml
+++ b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.EmploiType.dcm.xml
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Carriere\Entity\Db\EmploiType" table="carriere_emploitype">
- <id name="id" column="id" type="integer">
+ <id name="id" column="id" type="integer">
</id>
- <field name="libelleCourt" column="libelle_court" type="string" length="20" />
- <field name="libelleLong" column="libelle_long" type="string" length="200" />
- <field name="code" column="code" type="string" length="10" />
- <field name="dateDebut" column="date_debut" type="datetime" />
- <field name="dateFin" column="date_fin" type="datetime" />
+ <field name="libelleCourt" column="libelle_court" length="20"/>
+ <field name="libelleLong" column="libelle_long" length="200"/>
+ <field name="code" column="code" length="10"/>
+ <field name="dateDebut" column="date_debut" type="datetime"/>
+ <field name="dateFin" column="date_fin" type="datetime"/>
<one-to-many field="agentGrades" target-entity="Agent\Entity\Db\AgentGrade" mapped-by="emploiType"/>
<!-- DB IMPORT ############################# -->
- <field name="createdOn" column="created_on" type="datetime"/>
- <field name="updatedOn" column="updated_on" type="datetime"/>
- <field name="deletedOn" column="deleted_on" type="datetime"/>
- <field name="sourceId" column="source_id" length="128"/>
+ <field name="createdOn" column="created_on" type="datetime"/>
+ <field name="updatedOn" column="updated_on" type="datetime"/>
+ <field name="deletedOn" column="deleted_on" type="datetime"/>
+ <field name="sourceId" column="source_id" length="128"/>
</entity>
</doctrine-mapping>
diff --git a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Grade.dcm.xml b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Grade.dcm.xml
index 3da4cd48c64af902752781a1bd41441bf188514b..95c624ca6dca2406f33d96cab5fcdd30364218dc 100644
--- a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Grade.dcm.xml
+++ b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Grade.dcm.xml
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Carriere\Entity\Db\Grade" table="carriere_grade">
- <id name="id" column="id" type="integer">
+ <id name="id" column="id" type="integer">
</id>
- <field name="libelleCourt" column="lib_court" type="string" length="20" />
- <field name="libelleLong" column="lib_long" type="string" length="200" />
- <field name="code" column="code" type="string" length="10" />
- <field name="dateDebut" column="d_ouverture" type="datetime" />
- <field name="dateFin" column="d_fermeture" type="datetime" />
+ <field name="libelleCourt" column="lib_court" length="20"/>
+ <field name="libelleLong" column="lib_long" length="200"/>
+ <field name="code" column="code" length="10"/>
+ <field name="dateDebut" column="d_ouverture" type="datetime"/>
+ <field name="dateFin" column="d_fermeture" type="datetime"/>
<one-to-many field="agentGrades" target-entity="Agent\Entity\Db\AgentGrade" mapped-by="grade"/>
<!-- DB IMPORT ############################# -->
- <field name="createdOn" column="created_on" type="datetime"/>
- <field name="updatedOn" column="updated_on" type="datetime"/>
- <field name="deletedOn" column="deleted_on" type="datetime"/>
- <field name="sourceId" column="source_id" length="128"/>
+ <field name="createdOn" column="created_on" type="datetime"/>
+ <field name="updatedOn" column="updated_on" type="datetime"/>
+ <field name="deletedOn" column="deleted_on" type="datetime"/>
+ <field name="sourceId" column="source_id" length="128"/>
</entity>
</doctrine-mapping>
diff --git a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Niveau.dcm.xml b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Niveau.dcm.xml
index 1f528f3aab5bd96f98277602c4a85202e6b43414..a0c203a930a256ddee73a1d1d336333bc1a71bb0 100644
--- a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Niveau.dcm.xml
+++ b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Niveau.dcm.xml
@@ -1,27 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Carriere\Entity\Db\Niveau" table="carriere_niveau">
<id name="id" type="integer" column="id">
<generator strategy="IDENTITY"/>
</id>
- <field name="niveau" type="integer" column="niveau" nullable="false"/>
- <field name="etiquette" type="string" length="64" column="label" nullable="false"/>
- <field name="libelle" type="string" length="1024" column="libelle" nullable="false"/>
- <field name="description" type="string" length="9999" column="description" nullable="true"/>
+ <field name="niveau" type="integer" column="niveau" />
+ <field name="etiquette" length="64" column="label" />
+ <field name="libelle" length="1024" column="libelle" />
+ <field name="description" length="9999" column="description" nullable="true"/>
<!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
- <field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
- <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
+ <field name="histoCreation" type="datetime" column="histo_creation" />
+ <field name="histoModification" type="datetime" column="histo_modification" />
+ <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
diff --git a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.NiveauEnveloppe.dcm.xml b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.NiveauEnveloppe.dcm.xml
index b159b324e4d8fcdcb9ea22dd57a0f87585cfaee0..8bdc3115fcac4d057a96d73557bf5745849f2ee0 100644
--- a/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.NiveauEnveloppe.dcm.xml
+++ b/module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.NiveauEnveloppe.dcm.xml
@@ -1,33 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Carriere\Entity\Db\NiveauEnveloppe" table="carriere_niveau_enveloppe">
<id name="id" type="integer" column="id">
<generator strategy="IDENTITY"/>
</id>
- <many-to-one target-entity="Carriere\Entity\Db\Niveau" field="borneInferieure">
- <join-column name="borne_inferieure_id" referenced-column-name="id"/>
+ <many-to-one target-entity="Carriere\Entity\Db\Niveau" field="borneInferieure">
+ <join-column name="borne_inferieure_id"/>
</many-to-one>
- <many-to-one target-entity="Carriere\Entity\Db\Niveau" field="borneSuperieure">
- <join-column name="borne_superieure_id" referenced-column-name="id"/>
+ <many-to-one target-entity="Carriere\Entity\Db\Niveau" field="borneSuperieure">
+ <join-column name="borne_superieure_id"/>
</many-to-one>
- <many-to-one target-entity="Carriere\Entity\Db\Niveau" field="valeurRecommandee">
- <join-column name="valeur_recommandee_id" referenced-column-name="id"/>
+ <many-to-one target-entity="Carriere\Entity\Db\Niveau" field="valeurRecommandee">
+ <join-column name="valeur_recommandee_id"/>
</many-to-one>
- <field name="description" type="string" length="9999" column="description" nullable="true" />
+ <field name="description" length="9999" column="description" nullable="true"/>
<!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
- <field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
- <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
+ <field name="histoCreation" type="datetime" column="histo_creation"/>
+ <field name="histoModification" type="datetime" column="histo_modification"/>
+ <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
</entity>
diff --git a/module/Carriere/view/carriere/corps/afficher-agents.phtml b/module/Carriere/view/carriere/corps/afficher-agents.phtml
index e1695e4780d4f3e9d3bdc474c295e19e7fd1dcfc..0c7a239958638c836aa640ba7d0636995169cb30 100644
--- a/module/Carriere/view/carriere/corps/afficher-agents.phtml
+++ b/module/Carriere/view/carriere/corps/afficher-agents.phtml
@@ -3,10 +3,11 @@
/**
* @see \Carriere\Controller\CorpsController::afficherAgentsAvecCorpsAction();
* @var Corps $corps
- * @var \Agent\Entity\Db\AgentGrade[] $agentGrades
- * @var \Agent\Entity\Db\Agent[] $agents
+ * @var AgentGrade[] $agentGrades
+ * @var Agent[] $agents
*/
+use Agent\Entity\Db\Agent;
use Agent\Entity\Db\AgentGrade;
use Agent\Provider\Privilege\AgentPrivileges;
use Carriere\Entity\Db\Corps;
diff --git a/module/DemandeExterne/src/Controller/DemandeExterneController.php b/module/DemandeExterne/src/Controller/DemandeExterneController.php
index 951215f4b3edc29e91d4221c5343d50160fda4ec..246f267324b54e4bde0c15b05f69ccb4f06da30c 100644
--- a/module/DemandeExterne/src/Controller/DemandeExterneController.php
+++ b/module/DemandeExterne/src/Controller/DemandeExterneController.php
@@ -374,7 +374,7 @@ class DemandeExterneController extends AbstractActionController
$vm->setTemplate('unicaen-validation/validation-instance/validation-modal');
$vm->setVariables([
'title' => "Validation de la demande de formation externe",
- 'text' => "<div class='alert alert-info'>En validant cette demande de formation externe vous figez cette demande. Un courrier électronique sera envoyé à votre responsable pour la validation de celle-ci. </div>",
+ 'text' => "<div class='alert alert-info'>En validant cette demande de formation externe, vous figez cette demande. Un courrier électronique sera envoyé à votre responsable pour la validation de celle-ci. </div>",
'action' => $this->url()->fromRoute('demande-externe/valider-agent', ["demande-externe" => $demande->getId()], [], true),
'refus' => false,
]);
diff --git a/module/DemandeExterne/view/demande-externe/demande-externe/afficher-agent.phtml b/module/DemandeExterne/view/demande-externe/demande-externe/afficher-agent.phtml
index 09700ce1bf1d7d41faf93ca6e8e66b22d946b2ff..31bdcd55b4a9213f50f33b4d9c6e44b11fc5a980 100644
--- a/module/DemandeExterne/view/demande-externe/demande-externe/afficher-agent.phtml
+++ b/module/DemandeExterne/view/demande-externe/demande-externe/afficher-agent.phtml
@@ -44,7 +44,7 @@ $statuts = AgentStatut::generateStatutsArray($agentStatuts);
<li>
<?php
$structure = $agentAffectation->getStructure();
- $niveau2 = $structure ? $structure->getNiv2() : null;
+ $niveau2 = $structure?->getNiv2();
?>
<?php if ($structure) : ?>
<?php echo $structure->getLibelleLong(); ?>
@@ -79,7 +79,6 @@ $statuts = AgentStatut::generateStatutsArray($agentStatuts);
<li>
<?php echo ($grade) ? $grade->getLibelleLong() : "Grade non renseigné"; ?> <br/>
<?php echo ($corps) ? $corps->getLibelleLong() : "Corps non renseigné"; ?> <br/>
- <?php //echo ($correspondance) ? $correspondance->getLibelleLong() : "Correspondance non renseignée"; ?>
</li>
<?php endforeach; ?>
</ul>
diff --git a/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Fichier.dcm.xml b/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Fichier.dcm.xml
index a3ca491b3e475d45a6e254bb1104b9ced42594f1..6ae76eb184e9c50e41c7040fae0fb471ce9fa5a8 100644
--- a/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Fichier.dcm.xml
+++ b/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Fichier.dcm.xml
@@ -1,30 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Fichier\Entity\Db\Fichier" table="fichier_fichier">
<!-- !!!Remarque!!! il s'agit d'une chaine de caractère générée avec uniqid pour éviter les problèmes de forgeage ! -->
- <id name="id" type="string" length="13" column="id" />
+ <id name="id" length="13" column="id"/>
- <field name="nomOriginal" type="string" length="256" column="nom_original" nullable="false"/>
- <field name="nomStockage" type="string" length="256" column="nom_stockage" nullable="false"/>
+ <field name="nomOriginal" length="256" column="nom_original" />
+ <field name="nomStockage" length="256" column="nom_stockage" />
- <many-to-one target-entity="Fichier\Entity\Db\Nature" field="nature">
- <join-column name="nature" referenced-column-name="id"/>
+ <many-to-one target-entity="Fichier\Entity\Db\Nature" field="nature">
+ <join-column name="nature"/>
</many-to-one>
- <field name="typeMime" type="string" length="256" column="type_mime" nullable="true"/>
- <field name="taille" type="string" length="256" column="taille" nullable="true"/>
+ <field name="typeMime" length="256" column="type_mime" nullable="true"/>
+ <field name="taille" length="256" column="taille" nullable="true"/>
- <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
- <field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
- <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
+ <field name="histoCreation" type="datetime" column="histo_creation" />
+ <field name="histoModification" type="datetime" column="histo_modification" />
+ <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
</entity>
diff --git a/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Nature.dcm.xml b/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Nature.dcm.xml
index fd9cd391b5be513e91b9ee861f355f74828f1c1b..63a6cdab74d15cb9fa39b0bfdf3fc399c6f8a9fa 100644
--- a/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Nature.dcm.xml
+++ b/module/Fichier/src/Fichier/Entity/Db/Mapping/Fichier.Entity.Db.Nature.dcm.xml
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Fichier\Entity\Db\Nature" table="fichier_nature">
<id name="id" type="integer" column="id">
<generator strategy="IDENTITY"/>
</id>
- <field name="code" type="string" length="64" column="code" nullable="false"/>
- <field name="libelle" type="string" length="256" column="libelle" nullable="false"/>
- <field name="description" type="string" length="2048" column="description" nullable="true"/>
+ <field name="code" length="64" column="code" />
+ <field name="libelle" length="256" column="libelle" />
+ <field name="description" length="2048" column="description" nullable="true"/>
</entity>
</doctrine-mapping>
diff --git a/module/Fichier/src/Fichier/Form/Upload/UploadFormAwareTrait.php b/module/Fichier/src/Fichier/Form/Upload/UploadFormAwareTrait.php
index bc16a112fbb907440510b06437637497d00b1f37..e0cd3fae01a9897571e23b75c30cb24face5dc68 100644
--- a/module/Fichier/src/Fichier/Form/Upload/UploadFormAwareTrait.php
+++ b/module/Fichier/src/Fichier/Form/Upload/UploadFormAwareTrait.php
@@ -4,26 +4,16 @@ namespace Fichier\Form\Upload;
trait UploadFormAwareTrait {
- /** @var UploadForm $uploadForm */
- private $uploadForm;
+ private UploadForm $uploadForm;
- /**
- * @return UploadForm
- */
- public function getUploadForm()
+ public function getUploadForm(): UploadForm
{
return $this->uploadForm;
}
- /**
- * @param UploadForm $uploadForm
- * @return UploadForm
- */
- public function setUploadForm($uploadForm)
+ public function setUploadForm(UploadForm $uploadForm): void
{
$this->uploadForm = $uploadForm;
- return $this->uploadForm;
}
-
}
\ No newline at end of file
diff --git a/module/Fichier/src/Fichier/Form/Upload/UploadFormFactory.php b/module/Fichier/src/Fichier/Form/Upload/UploadFormFactory.php
index 4bb680e00bca239ec057e5c397c91f47f89debab..9e8a9412a2e7a1d5c3fee4c393955521be46a88f 100644
--- a/module/Fichier/src/Fichier/Form/Upload/UploadFormFactory.php
+++ b/module/Fichier/src/Fichier/Form/Upload/UploadFormFactory.php
@@ -4,21 +4,24 @@ namespace Fichier\Form\Upload;
use Fichier\Service\Nature\NatureService;
use Interop\Container\ContainerInterface;
-use Laminas\Form\FormElementManager;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
class UploadFormFactory {
- public function __invoke(ContainerInterface $container)
+ /**
+ * @throws ContainerExceptionInterface
+ * @throws NotFoundExceptionInterface
+ */
+ public function __invoke(ContainerInterface $container): UploadForm
{
- /** @var UploadHydrator $hydrator */
- $hydrator = $container->get('HydratorManager')->get(UploadHydrator::class);
-
/**
* @var NatureService $natureService
+ * @var UploadHydrator $hydrator
*/
+ $hydrator = $container->get('HydratorManager')->get(UploadHydrator::class);
$natureService = $container->get(NatureService::class);
- /** @var UploadForm $form */
$form = new UploadForm();
$form->setNatureService($natureService);
$form->setHydrator($hydrator);
diff --git a/module/Fichier/src/Fichier/Form/Upload/UploadHydrator.php b/module/Fichier/src/Fichier/Form/Upload/UploadHydrator.php
index 7cbe151b9ae50b308b58bab7fc195ab74c9663a2..2df1135a640b0394255318d11e5ae80ccdaa6701 100644
--- a/module/Fichier/src/Fichier/Form/Upload/UploadHydrator.php
+++ b/module/Fichier/src/Fichier/Form/Upload/UploadHydrator.php
@@ -19,7 +19,7 @@ class UploadHydrator implements HydratorInterface {
return $data;
}
- public function hydrate(array $data, $object)
+ public function hydrate(array $data, $object): object
{
return $object;
}
diff --git a/module/Fichier/src/Fichier/Service/Fichier/FichierService.php b/module/Fichier/src/Fichier/Service/Fichier/FichierService.php
index 36d3b9e4d9cf290164e088e860bbfe33bd738c82..1d15e28e421bc9f4b5ff59c9dbfde1b7406a348e 100644
--- a/module/Fichier/src/Fichier/Service/Fichier/FichierService.php
+++ b/module/Fichier/src/Fichier/Service/Fichier/FichierService.php
@@ -4,134 +4,61 @@ namespace Fichier\Service\Fichier;
use DateTime;
use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\Exception\ORMException;
+use DoctrineModule\Persistence\ProvidesObjectManager;
use Exception;
use Fichier\Entity\Db\Fichier;
use Fichier\Entity\Db\Nature;
+use Laminas\Mvc\Controller\AbstractActionController;
use UnicaenApp\Exception\RuntimeException;
-use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
-use Laminas\Mvc\Controller\AbstractActionController;
class FichierService {
- use EntityManagerAwareTrait;
+ use ProvidesObjectManager;
use UserServiceAwareTrait;
- private $path;
+ private ?string $path = null;
- /**
- * @param string $path
- * @return FichierService
- */
- public function setPath($path)
+ public function setPath(?string $path): FichierService
{
$this->path = $path;
return $this;
}
- /**
- * @param Fichier $fichier
- * @return Fichier
- */
- public function create($fichier)
+ public function create(Fichier $fichier): Fichier
{
- $user = $this->getUserService()->getConnectedUser();
- $date = new DateTime();
-
- $fichier->setHistoCreateur($user);
- $fichier->setHistoCreation($date);
- $fichier->setHistoModificateur($user);
- $fichier->setHistoModification($date);
-
- try {
- $this->getEntityManager()->persist($fichier);
- $this->getEntityManager()->flush($fichier);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème s'est produit lors de la création d'un Fichier.", $e);
- }
+ $this->getObjectManager()->persist($fichier);
+ $this->getObjectManager()->flush($fichier);
return $fichier;
}
- /**
- * @param Fichier $fichier
- * @return Fichier
- */
- public function update($fichier)
+ public function update(Fichier $fichier): Fichier
{
- $user = $this->getUserService()->getConnectedUser();
- $date = new DateTime();
-
- $fichier->setHistoModificateur($user);
- $fichier->setHistoModification($date);
-
- try {
- $this->getEntityManager()->flush($fichier);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème s'est produit lors de la mise à jour d'un Fichier.", $e);
- }
+ $this->getObjectManager()->flush($fichier);
return $fichier;
}
- /**
- * @param Fichier $fichier
- * @return Fichier
- */
- public function historise($fichier)
+ public function historise(Fichier $fichier): Fichier
{
- $user = $this->getUserService()->getConnectedUser();
- $date = new DateTime();
-
- $fichier->setHistoDestructeur($user);
- $fichier->setHistoDestruction($date);
-
- try {
- $this->getEntityManager()->flush($fichier);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème s'est produit lors de l'historisation d'un Fichier.", $e);
- }
+ $this->getObjectManager()->flush($fichier);
return $fichier;
}
- /**
- * @param Fichier $fichier
- * @return Fichier
- */
- public function restore($fichier)
+ public function restore(Fichier $fichier): Fichier
{
- $fichier->setHistoDestructeur(null);
- $fichier->setHistoDestruction(null);
-
- try {
- $this->getEntityManager()->flush($fichier);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème s'est produit lors de la restauration d'un Fichier.", $e);
- }
+ $this->getObjectManager()->flush($fichier);
return $fichier;
}
- /**
- * @param Fichier $fichier
- * @return Fichier
- */
- public function delete($fichier)
+ public function delete(Fichier $fichier): Fichier
{
-
- try {
- $this->getEntityManager()->remove($fichier);
- $this->getEntityManager()->flush();
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème s'est produit lors de la suppression d'un Fichier.", $e);
- }
+ $this->getObjectManager()->remove($fichier);
+ $this->getObjectManager()->flush();
return $fichier;
}
- /**
- * @param integer $id
- * @return Fichier
- */
- public function getFichier($id)
+ public function getFichier(?string $id): ?Fichier
{
- $qb = $this->getEntityManager()->getRepository(Fichier::class)->createQueryBuilder('fichier')
+ $qb = $this->getObjectManager()->getRepository(Fichier::class)->createQueryBuilder('fichier')
->andWhere('fichier.id = :id')
->setParameter('id', $id)
;
@@ -143,12 +70,7 @@ class FichierService {
return $result;
}
- /**
- * @param AbstractActionController $controller
- * @param string $paramName
- * @return Fichier
- */
- public function getRequestedFichier($controller, $paramName)
+ public function getRequestedFichier(AbstractActionController$controller, string $paramName='fichier'): ?Fichier
{
$id = $controller->params()->fromRoute($paramName);
$fichier = $this->getFichier($id);
@@ -207,13 +129,7 @@ class FichierService {
return $fichier;
}
- /**
- * Retourne le contenu d'un Fichier sous la forme d'une chaîne de caractères.
- *
- * @param Fichier $fichier
- * @return string
- */
- public function fetchContenuFichier(Fichier $fichier)
+ public function fetchContenuFichier(Fichier $fichier): string
{
$filePath = $this->path . $fichier->getNomStockage();
@@ -227,7 +143,7 @@ class FichierService {
return $contenuFichier;
}
- public function removeFichier(Fichier $fichier)
+ public function removeFichier(Fichier $fichier): void
{
$path = $this->path . $fichier->getNomStockage();
$res = unlink($path);
@@ -240,7 +156,6 @@ class FichierService {
public function readCSV(string $fichier_path, bool $explodeMultiline = false): array
{
-
$handle = fopen($fichier_path, "r");
$array = [];
$all = "";
diff --git a/module/Fichier/src/Fichier/Service/Fichier/FichierServiceFactory.php b/module/Fichier/src/Fichier/Service/Fichier/FichierServiceFactory.php
index ccf0a5257569fadd474fd8a5097bf851cd0b54b1..9132adde9690d2f42cab53582066ab529313229c 100644
--- a/module/Fichier/src/Fichier/Service/Fichier/FichierServiceFactory.php
+++ b/module/Fichier/src/Fichier/Service/Fichier/FichierServiceFactory.php
@@ -3,13 +3,18 @@
namespace Fichier\Service\Fichier;
use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
use UnicaenUtilisateur\Service\User\UserService;
-use Laminas\ServiceManager\ServiceLocatorInterface;
class FichierServiceFactory {
- public function __invoke(ContainerInterface $container)
+ /**
+ * @throws NotFoundExceptionInterface
+ * @throws ContainerExceptionInterface
+ */
+ public function __invoke(ContainerInterface $container): FichierService
{
$path = $container->get('Config')['unicaen-fichier']['upload-path'];
@@ -20,9 +25,8 @@ class FichierServiceFactory {
$entityManager = $container->get('doctrine.entitymanager.orm_default');
$userService = $container->get(UserService::class);
- /** @var FichierService $service */
$service = new FichierService();
- $service->setEntityManager($entityManager);
+ $service->setObjectManager($entityManager);
$service->setUserService($userService);
$service->setPath($path);
return $service;
diff --git a/module/Fichier/src/Fichier/Service/Nature/NatureService.php b/module/Fichier/src/Fichier/Service/Nature/NatureService.php
index 654f61f9a2eceb9d341c5ac3a375c4b3add74a9b..3066fdb770b4c791744c6a3d2a1c0fb095006711 100644
--- a/module/Fichier/src/Fichier/Service/Nature/NatureService.php
+++ b/module/Fichier/src/Fichier/Service/Nature/NatureService.php
@@ -3,18 +3,18 @@
namespace Fichier\Service\Nature;
use Doctrine\ORM\NonUniqueResultException;
+use DoctrineModule\Persistence\ProvidesObjectManager;
use Fichier\Entity\Db\Nature;
use UnicaenApp\Exception\RuntimeException;
-use UnicaenApp\Service\EntityManagerAwareTrait;
-class NatureService {
- use EntityManagerAwareTrait;
+class NatureService
+{
+ use ProvidesObjectManager;
- public function getNaturesAsOptions()
+ public function getNaturesAsOptions(): array
{
- $qb = $this->getEntityManager()->getRepository(Nature::class)->createQueryBuilder('nature')
+ $qb = $this->getObjectManager()->getRepository(Nature::class)->createQueryBuilder('nature')
->orderBy('nature.id');
- ;
$result = $qb->getQuery()->getResult();
$options = [];
@@ -26,38 +26,28 @@ class NatureService {
return $options;
}
- /**
- * @param integer $id
- * @return Nature
- */
- public function getNature($id)
+ public function getNature(?int $id): ?Nature
{
- $qb = $this->getEntityManager()->getRepository(Nature::class)->createQueryBuilder('nature')
+ $qb = $this->getObjectManager()->getRepository(Nature::class)->createQueryBuilder('nature')
->andWhere('nature.id = :id')
- ->setParameter('id', $id)
- ;
+ ->setParameter('id', $id);
try {
$result = $qb->getQuery()->getOneOrNullResult();
} catch (NonUniqueResultException $e) {
- throw new RuntimeException("Plusieurs Nature partagent le même identifiant [".$id."]", $e);
+ throw new RuntimeException("Plusieurs Nature partagent le même identifiant [" . $id . "]", $e);
}
return $result;
}
- /**
- * @param string $code
- * @return Nature
- */
- public function getNatureByCode($code)
+ public function getNatureByCode(?string $code): ?Nature
{
- $qb = $this->getEntityManager()->getRepository(Nature::class)->createQueryBuilder('nature')
+ $qb = $this->getObjectManager()->getRepository(Nature::class)->createQueryBuilder('nature')
->andWhere('nature.code = :code')
- ->setParameter('code', $code)
- ;
+ ->setParameter('code', $code);
try {
$result = $qb->getQuery()->getOneOrNullResult();
} catch (NonUniqueResultException $e) {
- throw new RuntimeException("Plusieurs Nature partagent le même code [".$code."]", $e);
+ throw new RuntimeException("Plusieurs Nature partagent le même code [" . $code . "]", $e);
}
return $result;
}
diff --git a/module/Fichier/src/Fichier/Service/Nature/NatureServiceFactory.php b/module/Fichier/src/Fichier/Service/Nature/NatureServiceFactory.php
index 449c555dc7bc9b2a8044111c058390e7521c0063..791de5e56b718a0072e168b0d861241be847edc7 100644
--- a/module/Fichier/src/Fichier/Service/Nature/NatureServiceFactory.php
+++ b/module/Fichier/src/Fichier/Service/Nature/NatureServiceFactory.php
@@ -3,21 +3,26 @@
namespace Fichier\Service\Nature;
use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
-class NatureServiceFactory {
+class NatureServiceFactory
+{
- public function __invoke(ContainerInterface $container)
+ /**
+ * @throws ContainerExceptionInterface
+ * @throws NotFoundExceptionInterface
+ */
+ public function __invoke(ContainerInterface $container): NatureService
{
/**
* @var EntityManager $entityManager
*/
$entityManager = $container->get('doctrine.entitymanager.orm_default');
- /** @var NatureService $service */
$service = new NatureService();
- $service->setEntityManager($entityManager);
+ $service->setObjectManager($entityManager);
return $service;
}
}
\ No newline at end of file
diff --git a/module/Formation/src/Formation/Service/Notification/NotificationService.php b/module/Formation/src/Formation/Service/Notification/NotificationService.php
index 07ef2739686723ae52913fab960346976fb218f2..f2daee31136b62c657d1c2435d336b5dd0fa74d5 100644
--- a/module/Formation/src/Formation/Service/Notification/NotificationService.php
+++ b/module/Formation/src/Formation/Service/Notification/NotificationService.php
@@ -97,7 +97,7 @@ class NotificationService
/** GESTION DES INSCRIPTIONS **************************************************************************************/
- /** Notification vers le ou la validateur·trice lors de l'inscription à une session par un agent */
+ /** Notification vers le ou la valideur·euse lors de l'inscription à une session par un agent */
public function triggerInscriptionAgent(Inscription $inscription): ?Mail
{
$session = $inscription->getSession();
@@ -322,7 +322,7 @@ class NotificationService
return null;
}
- /** Notification vers les inscrit·e ayant eu une absence */
+ /** Notification vers les inscrit·es ayant eu une absence */
public function triggerConstatAbsence(Inscription $inscrit): ?Mail
{
$session = $inscrit->getSession();
@@ -389,7 +389,7 @@ class NotificationService
return $mail;
}
- /** Notification vers les inscrit·e de l'annulation */
+ /** Notification vers les inscrit·es de l'annulation */
public function triggerSessionAnnulee(Inscription $inscrit): ?Mail
{
$session = $inscrit->getSession();
diff --git a/module/Formation/view/error/403.phtml b/module/Formation/view/error/403.phtml
index 0f3156a74475e30c2068682ca5b9924c229f651f..98a9f652a4f1d59094e18aaf9a8a3274201c5e5c 100644
--- a/module/Formation/view/error/403.phtml
+++ b/module/Formation/view/error/403.phtml
@@ -18,8 +18,8 @@ $email_assistance = $this->parametreValue(MailParametres::TYPE, MailParametres:
<div style="font-size: 21px; font-weight: 200;">
Résolution possible :
<ul>
- <li> vérifiez que vous êtes bien authentifié·e ;</li>
- <li> vérifiez que vous incarnez un rôle permettant d'accéder à cette page. </li>
+ <li> Vérifiez que vous êtes bien authentifié·e ;</li>
+ <li> Vérifiez que vous incarnez un rôle permettant d'accéder à cette page. </li>
</ul>
Si le problème persiste, merci de contacter l'assistance : <a href="mailto:<?php echo $email_assistance; ?>" target="_blank"><?php echo $email_assistance; ?></a>
diff --git a/module/Formation/view/formation/inscription/afficher-agent.phtml b/module/Formation/view/formation/inscription/afficher-agent.phtml
index 1d378970487ff0c0d2ded48e920079d975a4b6ef..093c0cd8601e7cf79130aa842579ea6d96b65db7 100644
--- a/module/Formation/view/formation/inscription/afficher-agent.phtml
+++ b/module/Formation/view/formation/inscription/afficher-agent.phtml
@@ -45,7 +45,7 @@ $statuts = AgentStatut::generateStatutsArray($agentStatuts);
<li>
<?php
$structure = $agentAffectation->getStructure();
- $niveau2 = $structure?$structure->getNiv2():null;
+ $niveau2 = $structure?->getNiv2();
?>
<?php if ($structure) : ?>
<?php echo $structure->getLibelleLong(); ?>
diff --git a/module/Formation/view/formation/inscription/partial/inscription.phtml b/module/Formation/view/formation/inscription/partial/inscription.phtml
index ad4e2b02414c3682a4e1f06037d9219425f40777..d85cf1194a41b2ca6a6a8e5b811310cdbe618ed2 100644
--- a/module/Formation/view/formation/inscription/partial/inscription.phtml
+++ b/module/Formation/view/formation/inscription/partial/inscription.phtml
@@ -1,11 +1,12 @@
<?php
/**
- * @var \Formation\Entity\Db\Inscription $inscription
- * @var \Formation\Entity\Db\Session $session
+ * @var Inscription $inscription
+ * @var Session $session
*/
use Formation\Entity\Db\Inscription;
+use Formation\Entity\Db\Session;
use Formation\Provider\Etat\InscriptionEtats;
use Formation\Provider\Etat\SessionEtats;
diff --git a/module/Formation/view/formation/session/afficher.phtml b/module/Formation/view/formation/session/afficher.phtml
index 7efeedeead14c8664c1d9abbe984636a2197302a..8f0d24fc11fc082eb634502853300d2d8aaf2613 100644
--- a/module/Formation/view/formation/session/afficher.phtml
+++ b/module/Formation/view/formation/session/afficher.phtml
@@ -79,7 +79,7 @@ $canMesSessions = $this->isAllowed(FormateurPrivileges::getResourceId(FormateurP
Raison·s :
<ul>
<?php if (!empty($presencesManquantes)) : ?>
- <li> des présences sont non renseignées
+ <li> Des présences sont non renseignées
(<?php echo implode(", ", array_unique(array_map(function ($a) {
return $a['personne'];
}, $presencesManquantes))); ?>)
@@ -87,7 +87,7 @@ $canMesSessions = $this->isAllowed(FormateurPrivileges::getResourceId(FormateurP
<?php endif; ?>
<?php if (!empty($fraisManquants)) : ?>
<li>
- des frais sont non renseignés (<?php echo implode(", ", array_map(function ($a) {
+ Des frais sont non renseignés (<?php echo implode(", ", array_map(function ($a) {
return $a['personne'];
}, $fraisManquants)); ?>)
</li>
diff --git a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Observateur.dcm.xml b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Observateur.dcm.xml
index 0ab88ae50296d067d2e517b18961f1c86b81e086..26287540ed515bdeffb6e9f0cdfcb9968b0439bf 100644
--- a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Observateur.dcm.xml
+++ b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Observateur.dcm.xml
@@ -1,30 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Structure\Entity\Db\Observateur" table="structure_observateur">
- <id name="id" column="id" type="integer" >
+ <id name="id" column="id" type="integer">
<generator strategy="IDENTITY"/>
</id>
<many-to-one target-entity="Structure\Entity\Db\Structure" field="structure">
- <join-column name="structure_id" referenced-column-name="id" />
+ <join-column name="structure_id" />
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="utilisateur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="utilisateur">
<join-column name="utilisateur_id" referenced-column-name="ID"/>
</many-to-one>
- <field name="description" column="description" type="text"/>
+ <field name="description" column="description" type="text"/>
<!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
- <field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
- <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
+ <field name="histoCreation" type="datetime" column="histo_creation" />
+ <field name="histoModification" type="datetime" column="histo_modification" />
+ <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
diff --git a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml
index 53063a191b7d9c7448b2ad1f6fa71254203cbb77..34cd3ccb80f83958a2783e2d1303ec653bc35a1c 100644
--- a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml
+++ b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml
@@ -1,49 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Structure\Entity\Db\Structure" table="structure">
- <id name="id" column="id" type="integer" >
+ <id name="id" column="id" type="integer">
</id>
- <field name="code" column="code" type="string" length="40" />
+ <field name="code" column="code" length="40"/>
- <field name="libelleCourt" column="libelle_court" type="string" length="128"/>
- <field name="libelleLong" column="libelle_long" type="string" length="1024"/>
- <field name="description" column="description" type="string" length="10240"/>
- <field name="adresseFonctionnelle" column="adresse_fonctionnelle" type="string" length="1024"/>
- <field name="ouverture" column="d_ouverture" type="datetime" />
- <field name="fermeture" column="d_fermeture" type="datetime" />
- <field name="fermetureOW" column="fermeture_ow" type="datetime" />
- <field name="repriseResumeMere" column="resume_mere" type="boolean" />
+ <field name="libelleCourt" column="libelle_court" length="128"/>
+ <field name="libelleLong" column="libelle_long" length="1024"/>
+ <field name="description" column="description" length="10240"/>
+ <field name="adresseFonctionnelle" column="adresse_fonctionnelle" length="1024"/>
+ <field name="ouverture" column="d_ouverture" type="datetime"/>
+ <field name="fermeture" column="d_fermeture" type="datetime"/>
+ <field name="fermetureOW" column="fermeture_ow" type="datetime"/>
+ <field name="repriseResumeMere" column="resume_mere" type="boolean"/>
<many-to-one target-entity="Structure\Entity\Db\StructureType" field="type">
- <join-column name="type_id" referenced-column-name="id" />
+ <join-column name="type_id" />
</many-to-one>
- <one-to-many target-entity="Structure\Entity\Db\StructureAgentForce" mapped-by="structure" field="agentsForces"/>
+ <one-to-many target-entity="Structure\Entity\Db\StructureAgentForce" mapped-by="structure"
+ field="agentsForces"/>
<one-to-many target-entity="Agent\Entity\Db\AgentAffectation" mapped-by="structure" field="affectations"/>
- <one-to-many field="gestionnaires" target-entity="Structure\Entity\Db\StructureGestionnaire" mapped-by="structure"/>
- <one-to-many field="responsables" target-entity="Structure\Entity\Db\StructureResponsable" mapped-by="structure"/>
+ <one-to-many field="gestionnaires" target-entity="Structure\Entity\Db\StructureGestionnaire"
+ mapped-by="structure"/>
+ <one-to-many field="responsables" target-entity="Structure\Entity\Db\StructureResponsable"
+ mapped-by="structure"/>
<many-to-one target-entity="Structure\Entity\Db\Structure" field="parent">
- <join-column name="parent_id" referenced-column-name="id" />
+ <join-column name="parent_id" />
</many-to-one>
<one-to-many target-entity="Structure\Entity\Db\Structure" mapped-by="parent" field="enfants"/>
<many-to-one target-entity="Structure\Entity\Db\Structure" field="niv2">
- <join-column name="niv2_id" referenced-column-name="id" />
+ <join-column name="niv2_id" />
</many-to-one>
<many-to-one target-entity="Structure\Entity\Db\Structure" field="niv2OverWriten">
- <join-column name="niv2_id_ow" referenced-column-name="id" />
+ <join-column name="niv2_id_ow" />
</many-to-one>
<!-- DB IMPORT ############################# -->
- <field name="createdOn" column="created_on" type="datetime"/>
- <field name="updatedOn" column="updated_on" type="datetime"/>
- <field name="deletedOn" column="deleted_on" type="datetime"/>
- <field name="sourceId" column="source_id" length="128"/>
+ <field name="createdOn" column="created_on" type="datetime"/>
+ <field name="updatedOn" column="updated_on" type="datetime"/>
+ <field name="deletedOn" column="deleted_on" type="datetime"/>
+ <field name="sourceId" column="source_id" length="128"/>
</entity>
</doctrine-mapping>
diff --git a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureAgentForce.dcm.xml b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureAgentForce.dcm.xml
index 53b615fd10421c5973bf5ebe39c9f69a171e5497..55de2a0824fa841e3445a1859e6293913ef764cd 100644
--- a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureAgentForce.dcm.xml
+++ b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureAgentForce.dcm.xml
@@ -1,30 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Structure\Entity\Db\StructureAgentForce" table="structure_agent_force">
- <id name="id" column="id" type="integer" >
+ <id name="id" column="id" type="integer">
<generator strategy="IDENTITY"/>
</id>
<many-to-one target-entity="Structure\Entity\Db\Structure" field="structure">
- <join-column name="structure_id" referenced-column-name="id" />
+ <join-column name="structure_id"/>
</many-to-one>
<many-to-one target-entity="Agent\Entity\Db\Agent" field="agent">
- <join-column name="agent_id" referenced-column-name="c_individu" />
+ <join-column name="agent_id" referenced-column-name="c_individu"/>
</many-to-one>
<!-- HISTO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
- <field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
- <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
+ <field name="histoCreation" type="datetime" column="histo_creation"/>
+ <field name="histoModification" type="datetime" column="histo_modification"/>
+ <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
- <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
+ <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
</entity>
diff --git a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureGestionnaire.dcm.xml b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureGestionnaire.dcm.xml
index edf3a668dc35c5c8b30d59d0ecdda0bfde8fb81f..d52ed3bddd1685fe7e409fc882f3bfa4d8470b3b 100644
--- a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureGestionnaire.dcm.xml
+++ b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureGestionnaire.dcm.xml
@@ -1,29 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Structure\Entity\Db\StructureGestionnaire" table="structure_gestionnaire">
- <id name="id" column="id" type="integer" >
+ <id name="id" column="id" type="integer">
<generator strategy="IDENTITY"/>
</id>
<many-to-one target-entity="Structure\Entity\Db\Structure" field="structure">
- <join-column name="structure_id" referenced-column-name="id" />
+ <join-column name="structure_id"/>
</many-to-one>
<many-to-one target-entity="Agent\Entity\Db\Agent" field="agent">
- <join-column name="agent_id" referenced-column-name="c_individu" />
+ <join-column name="agent_id" referenced-column-name="c_individu"/>
</many-to-one>
- <field name="fonctionId" type="integer" column="fonction_id" nullable="false"/>
+ <field name="fonctionId" type="integer" column="fonction_id"/>
- <field name="dateDebut" type="datetime" column="date_debut" nullable="false"/>
- <field name="dateFin" type="datetime" column="date_fin" nullable="false"/>
+ <field name="dateDebut" type="datetime" column="date_debut"/>
+ <field name="dateFin" type="datetime" column="date_fin"/>
<!-- DB IMPORT ############################# -->
- <field name="createdOn" column="created_on" type="datetime"/>
- <field name="updatedOn" column="updated_on" type="datetime"/>
- <field name="deletedOn" column="deleted_on" type="datetime"/>
- <field name="sourceId" column="source_id" length="128"/>
+ <field name="createdOn" column="created_on" type="datetime"/>
+ <field name="updatedOn" column="updated_on" type="datetime"/>
+ <field name="deletedOn" column="deleted_on" type="datetime"/>
+ <field name="sourceId" column="source_id" length="128"/>
</entity>
</doctrine-mapping>
diff --git a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureResponsable.dcm.xml b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureResponsable.dcm.xml
index 996f046093550a505fe97e932604ddce23bbf863..628a42600ed93de462e7fe947db7f4eba5592117 100644
--- a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureResponsable.dcm.xml
+++ b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureResponsable.dcm.xml
@@ -1,30 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Structure\Entity\Db\StructureResponsable" table="structure_responsable">
- <id name="id" column="id" type="integer" >
+ <id name="id" column="id" type="integer">
<generator strategy="IDENTITY"/>
</id>
<many-to-one target-entity="Structure\Entity\Db\Structure" field="structure">
- <join-column name="structure_id" referenced-column-name="id" />
+ <join-column name="structure_id"/>
</many-to-one>
<many-to-one target-entity="Agent\Entity\Db\Agent" field="agent">
- <join-column name="agent_id" referenced-column-name="c_individu" />
+ <join-column name="agent_id" referenced-column-name="c_individu"/>
</many-to-one>
- <field name="fonctionId" type="integer" column="fonction_id" nullable="false"/>
+ <field name="fonctionId" type="integer" column="fonction_id" />
- <field name="dateDebut" type="datetime" column="date_debut" nullable="false"/>
- <field name="dateFin" type="datetime" column="date_fin" nullable="false"/>
+ <field name="dateDebut" type="datetime" column="date_debut" />
+ <field name="dateFin" type="datetime" column="date_fin" />
<!-- DB IMPORT ############################# -->
- <field name="createdOn" column="created_on" type="datetime"/>
- <field name="updatedOn" column="updated_on" type="datetime"/>
- <field name="deletedOn" column="deleted_on" type="datetime"/>
- <field name="sourceId" column="source_id" length="128"/>
+ <field name="createdOn" column="created_on" type="datetime"/>
+ <field name="updatedOn" column="updated_on" type="datetime"/>
+ <field name="deletedOn" column="deleted_on" type="datetime"/>
+ <field name="sourceId" column="source_id" length="128"/>
</entity>
</doctrine-mapping>
diff --git a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureType.dcm.xml b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureType.dcm.xml
index e43145f14e4e59fde7fd6da9a220d95deef61ae5..50e74fc5d74b75614f948b8a7f14bf9e501e18cc 100644
--- a/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureType.dcm.xml
+++ b/module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.StructureType.dcm.xml
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Structure\Entity\Db\StructureType" table="structure_type">
<id name="id" type="integer" column="id">
<generator strategy="IDENTITY"/>
</id>
- <field name="code" type="string" length="64" column="code" nullable="false"/>
- <field name="libelle" type="string" length="256" column="libelle" nullable="false"/>
+ <field name="code" length="64" column="code" />
+ <field name="libelle" length="256" column="libelle" />
</entity>
</doctrine-mapping>
diff --git a/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceService.php b/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceService.php
index 7833a51afb98fcee3efa58af9b14f9cf316483a1..2a616301201e6066c4e054321ab448433903876b 100644
--- a/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceService.php
+++ b/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceService.php
@@ -3,76 +3,44 @@
namespace Structure\Service\StructureAgentForce;
use Agent\Entity\Db\Agent;
-use Doctrine\ORM\Exception\ORMException;
use Doctrine\ORM\NonUniqueResultException;
use Doctrine\ORM\QueryBuilder;
+use DoctrineModule\Persistence\ProvidesObjectManager;
use Laminas\Mvc\Controller\AbstractActionController;
use Structure\Entity\Db\Structure;
use Structure\Entity\Db\StructureAgentForce;
use UnicaenApp\Exception\RuntimeException;
-use UnicaenApp\Service\EntityManagerAwareTrait;
-class StructureAgentForceService {
- use EntityManagerAwareTrait;
+class StructureAgentForceService
+{
+ use ProvidesObjectManager;
/** GESTION DES ENTITES *******************************************************************************************/
- /**
- * @param StructureAgentForce $structureAgentForce
- * @return StructureAgentForce
- */
- public function create(StructureAgentForce $structureAgentForce) : StructureAgentForce
+ public function create(StructureAgentForce $structureAgentForce): StructureAgentForce
{
- try {
- $this->getEntityManager()->persist($structureAgentForce);
- $this->getEntityManager()->flush($structureAgentForce);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème est survenue lors de l'enregistrement en BD.", $e);
- }
+ $this->getObjectManager()->persist($structureAgentForce);
+ $this->getObjectManager()->flush($structureAgentForce);
return $structureAgentForce;
}
- /**
- * @param StructureAgentForce $structureAgentForce
- * @return StructureAgentForce
- */
- public function upgrade(StructureAgentForce $structureAgentForce) : StructureAgentForce
+ public function update(StructureAgentForce $structureAgentForce): StructureAgentForce
{
- try {
- $this->getEntityManager()->flush($structureAgentForce);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème est survenue lors de l'enregistrement en BD.", $e);
- }
+ $this->getObjectManager()->flush($structureAgentForce);
return $structureAgentForce;
}
- /**
- * @param StructureAgentForce $structureAgentForce
- * @return StructureAgentForce
- */
- public function historise(StructureAgentForce $structureAgentForce) : StructureAgentForce
+ public function historise(StructureAgentForce $structureAgentForce): StructureAgentForce
{
- try {
- $structureAgentForce->historiser();
- $this->getEntityManager()->flush($structureAgentForce);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème est survenue lors de l'enregistrement en BD.", $e);
- }
+ $structureAgentForce->historiser();
+ $this->getObjectManager()->flush($structureAgentForce);
return $structureAgentForce;
}
- /**
- * @param StructureAgentForce $structureAgentForce
- * @return StructureAgentForce
- */
- public function restore(StructureAgentForce $structureAgentForce) : StructureAgentForce
+ public function restore(StructureAgentForce $structureAgentForce): StructureAgentForce
{
- try {
- $structureAgentForce->dehistoriser();
- $this->getEntityManager()->flush($structureAgentForce);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème est survenue lors de l'enregistrement en BD.", $e);
- }
+ $structureAgentForce->dehistoriser();
+ $this->getObjectManager()->flush($structureAgentForce);
return $structureAgentForce;
}
@@ -80,28 +48,20 @@ class StructureAgentForceService {
* @param StructureAgentForce $structureAgentForce
* @return StructureAgentForce
*/
- public function delete(StructureAgentForce $structureAgentForce) : StructureAgentForce
+ public function delete(StructureAgentForce $structureAgentForce): StructureAgentForce
{
- try {
- $this->getEntityManager()->remove($structureAgentForce);
- $this->getEntityManager()->flush($structureAgentForce);
- } catch (ORMException $e) {
- throw new RuntimeException("Un problème est survenue lors de l'enregistrement en BD.", $e);
- }
+ $this->getObjectManager()->remove($structureAgentForce);
+ $this->getObjectManager()->flush($structureAgentForce);
return $structureAgentForce;
}
/** REQUETAGE *****************************************************************************************************/
- /**
- * @return QueryBuilder
- */
- public function createQueryBuilder() : QueryBuilder
+ public function createQueryBuilder(): QueryBuilder
{
- $qb = $this->getEntityManager()->getRepository(StructureAgentForce::class)->createQueryBuilder('force')
+ $qb = $this->getObjectManager()->getRepository(StructureAgentForce::class)->createQueryBuilder('force')
->addSelect('agent')->join('force.agent', 'agent')
- ->addSelect('structure')->join('force.structure', 'structure')
- ;
+ ->addSelect('structure')->join('force.structure', 'structure');
return $qb;
}
@@ -109,16 +69,15 @@ class StructureAgentForceService {
* @param int $id
* @return StructureAgentForce|null
*/
- public function getStructureAgentForce(int $id) : ?StructureAgentForce
+ public function getStructureAgentForce(int $id): ?StructureAgentForce
{
- $qb = $this->createQueryBuilder()
+ $qb = $this->createQueryBuilder()
->andWhere('force.id = :id')
- ->setParameter('id', $id)
- ;
+ ->setParameter('id', $id);
try {
$result = $qb->getQuery()->getOneOrNullResult();
} catch (NonUniqueResultException $e) {
- throw new RuntimeException("Plusieurs StructureAgentForce partagent le même id [".$id."]");
+ throw new RuntimeException("Plusieurs StructureAgentForce partagent le même id [" . $id . "]");
}
return $result;
}
@@ -128,7 +87,7 @@ class StructureAgentForceService {
* @param string $param
* @return StructureAgentForce|null
*/
- public function getRequestedStructureAgentForce(AbstractActionController $controller, string $param="structure-agent-force") : ?StructureAgentForce
+ public function getRequestedStructureAgentForce(AbstractActionController $controller, string $param = "structure-agent-force"): ?StructureAgentForce
{
$id = $controller->params()->fromRoute($param);
$result = $this->getStructureAgentForce($id);
@@ -140,19 +99,18 @@ class StructureAgentForceService {
* @param Agent|null $agent
* @return StructureAgentForce
*/
- public function getStructureAgentForceByStructureAndAgent(?Structure $structure, ?Agent $agent) : ?StructureAgentForce
+ public function getStructureAgentForceByStructureAndAgent(?Structure $structure, ?Agent $agent): ?StructureAgentForce
{
$qb = $this->createQueryBuilder()
->andWhere('force.agent = :agent')
->andWhere('force.structure = :structure')
->andWhere('force.histoDestruction IS NULL')
->setParameter('agent', $agent)
- ->setParameter('structure', $structure)
- ;
+ ->setParameter('structure', $structure);
try {
$result = $qb->getQuery()->getOneOrNullResult();
} catch (NonUniqueResultException $e) {
- throw new RuntimeException("Plusieurs StructureAgentForce partagent le même agent [".$agent->getId()."] et la même structure [".$structure->getId()."].");
+ throw new RuntimeException("Plusieurs StructureAgentForce partagent le même agent [" . $agent->getId() . "] et la même structure [" . $structure->getId() . "].");
}
return $result;
}
@@ -165,8 +123,7 @@ class StructureAgentForceService {
{
$qb = $this->createQueryBuilder()
->andWhere('force.structure in (:structures)')->setParameter('structures', $structures)
- ->andWhere('force.histoDestruction IS NULL')
- ;
+ ->andWhere('force.histoDestruction IS NULL');
$result = $qb->getQuery()->getResult();
return $result;
diff --git a/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceServiceFactory.php b/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceServiceFactory.php
index d5712b8de6ea719d229ac48fdcf60d7bedae7492..1da4306271140ff3e89858606cfc1cf925efaf50 100644
--- a/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceServiceFactory.php
+++ b/module/Structure/src/Structure/Service/StructureAgentForce/StructureAgentForceServiceFactory.php
@@ -5,13 +5,10 @@ namespace Structure\Service\StructureAgentForce;
use Doctrine\ORM\EntityManager;
use Interop\Container\ContainerInterface;
-class StructureAgentForceServiceFactory {
+class StructureAgentForceServiceFactory
+{
- /**
- * @param ContainerInterface $container
- * @return StructureAgentForceService
- */
- public function __invoke(ContainerInterface $container)
+ public function __invoke(ContainerInterface $container): StructureAgentForceService
{
/**
* @var EntityManager $entityManager
@@ -19,7 +16,7 @@ class StructureAgentForceServiceFactory {
$entityManager = $container->get('doctrine.entitymanager.orm_default');
$service = new StructureAgentForceService();
- $service->setEntityManager($entityManager);
+ $service->setObjectManager($entityManager);
return $service;
}
}
\ No newline at end of file
diff --git a/module/Structure/src/Structure/Service/Type/TypeService.php b/module/Structure/src/Structure/Service/Type/TypeService.php
index 03d4d2ff95f6979d3556f4437d456284fa7bffe4..d1fc43bd2a4678e16dbeab9335d539d0f5d1adfc 100644
--- a/module/Structure/src/Structure/Service/Type/TypeService.php
+++ b/module/Structure/src/Structure/Service/Type/TypeService.php
@@ -2,77 +2,57 @@
namespace Structure\Service\Type;
-use Doctrine\ORM\Exception\ORMException;
-use RuntimeException;
+use DoctrineModule\Persistence\ProvidesObjectManager;
use Structure\Entity\Db\StructureType;
-use UnicaenApp\Service\EntityManagerAwareTrait;
-class TypeService {
- use EntityManagerAwareTrait;
+class TypeService
+{
+ use ProvidesObjectManager;
/** GESTION DES ENTITES ************************************************/
- public function create(StructureType $type) : StructureType
+ public function create(StructureType $type): StructureType
{
- try {
- $this->getEntityManager()->persist($type);
- $this->getEntityManager()->flush($type);
- } catch(ORMException $e) {
- throw new RuntimeException("Un problème est survenue en base de donnée.",0,$e);
- }
+ $this->getObjectManager()->persist($type);
+ $this->getObjectManager()->flush($type);
return $type;
}
- public function update(StructureType $type) : StructureType
+ public function update(StructureType $type): StructureType
{
- try {
- $this->getEntityManager()->flush($type);
- } catch(ORMException $e) {
- throw new RuntimeException("Un problème est survenue en base de donnée.",0,$e);
- }
+ $this->getObjectManager()->flush($type);
return $type;
}
- public function historise(StructureType $type) : StructureType
+ public function historise(StructureType $type): StructureType
{
- try {
- $type->historise();
- $this->getEntityManager()->flush($type);
- } catch(ORMException $e) {
- throw new RuntimeException("Un problème est survenue en base de donnée.",0,$e);
- }
+ $type->historise();
+ $this->getObjectManager()->flush($type);
return $type;
}
- public function restore(StructureType $type) : StructureType
+ public function restore(StructureType $type): StructureType
{
- try {
- $type->dehistorise();
- $this->getEntityManager()->flush($type);
- } catch(ORMException $e) {
- throw new RuntimeException("Un problème est survenue en base de donnée.",0,$e);
- }
+ $type->dehistorise();
+ $this->getObjectManager()->flush($type);
return $type;
}
- public function delete(StructureType $type) : StructureType
+ public function delete(StructureType $type): StructureType
{
- try {
- $this->getEntityManager()->remove($type);
- $this->getEntityManager()->flush($type);
- } catch(ORMException $e) {
- throw new RuntimeException("Un problème est survenue en base de donnée.",0,$e);
- }
+ $this->getObjectManager()->remove($type);
+ $this->getObjectManager()->flush($type);
return $type;
}
/** QUERYING ******************************************************************/
/** @return StructureType[] */
- public function getTypes() : array
+ public function getTypes(): array
{
- $result = $this->getEntityManager()->getRepository(StructureType::class)->findAll();
- $types = []; foreach ($result as $item) $types[$item->getId()] = $item;
+ $result = $this->getObjectManager()->getRepository(StructureType::class)->findAll();
+ $types = [];
+ foreach ($result as $item) $types[$item->getId()] = $item;
return $types;
}
diff --git a/module/Structure/src/Structure/Service/Type/TypeServiceFactory.php b/module/Structure/src/Structure/Service/Type/TypeServiceFactory.php
index 70466dab7d57b682f80e3a985eb3905bf8200bf9..0670b8ddfa7e7130736c03965e2acc0e1d2394b8 100644
--- a/module/Structure/src/Structure/Service/Type/TypeServiceFactory.php
+++ b/module/Structure/src/Structure/Service/Type/TypeServiceFactory.php
@@ -3,17 +3,24 @@
namespace Structure\Service\Type;
use Doctrine\ORM\EntityManager;
+use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
-class TypeServiceFactory {
+class TypeServiceFactory
+{
- public function __invoke(ContainerInterface $container) : TypeService
+ /**
+ * @throws ContainerExceptionInterface
+ * @throws NotFoundExceptionInterface
+ */
+ public function __invoke(ContainerInterface $container): TypeService
{
/** @var EntityManager $entityManager */
$entityManager = $container->get('doctrine.entitymanager.orm_default');
$service = new TypeService();
- $service->setEntityManager($entityManager);
+ $service->setObjectManager($entityManager);
return $service;
}
}
\ No newline at end of file