Skip to content
GitLab
Commit acaa5c5f authored by Laurent Lécluse's avatar Laurent Lécluse
Browse files

divers

parent 7b26916c
Hide whitespace changes
Inline Side-by-side
composer.lock
View file @ acaa5c5f
......@@ -1358,12 +1358,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/orm.git",
"reference": "978f687df91c98f4fb0bf0de950cb0a336a4c135"
"reference": "601728045cc27caedb6d68771a6b9876fdabd39d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/orm/zipball/978f687df91c98f4fb0bf0de950cb0a336a4c135",
"reference": "978f687df91c98f4fb0bf0de950cb0a336a4c135",
"url": "https://api.github.com/repos/doctrine/orm/zipball/601728045cc27caedb6d68771a6b9876fdabd39d",
"reference": "601728045cc27caedb6d68771a6b9876fdabd39d",
"shasum": ""
},
"require": {
......@@ -1392,13 +1392,13 @@
"doctrine/annotations": "^1.13",
"doctrine/coding-standard": "^9.0",
"phpbench/phpbench": "^0.16.10 || ^1.0",
"phpstan/phpstan": "1.4.3",
"phpstan/phpstan": "1.4.6",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
"psr/log": "^1 || ^2 || ^3",
"squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"vimeo/psalm": "4.19.0"
"vimeo/psalm": "4.20.0"
},
"suggest": {
"symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0",
......@@ -1449,7 +1449,7 @@
"issues": "https://github.com/doctrine/orm/issues",
"source": "https://github.com/doctrine/orm/tree/2.12.x"
},
"time": "2022-02-07T08:34:45+00:00"
"time": "2022-02-08T23:51:01+00:00"
},
{
"name": "doctrine/persistence",
......@@ -3668,12 +3668,12 @@
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-mvc.git",
"reference": "e00129958df85fb071e1ff5c931d01df05485c7f"
"reference": "16bb3bc6bed6cc42ef4d2e5e7dc4a5c97841c6a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/e00129958df85fb071e1ff5c931d01df05485c7f",
"reference": "e00129958df85fb071e1ff5c931d01df05485c7f",
"url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/16bb3bc6bed6cc42ef4d2e5e7dc4a5c97841c6a2",
"reference": "16bb3bc6bed6cc42ef4d2e5e7dc4a5c97841c6a2",
"shasum": ""
},
"require": {
......@@ -3742,7 +3742,7 @@
"type": "community_bridge"
}
],
"time": "2022-02-02T12:53:57+00:00"
"time": "2022-02-08T21:08:00+00:00"
},
{
"name": "laminas/laminas-mvc-i18n",
......@@ -4470,12 +4470,12 @@
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-servicemanager.git",
"reference": "727830c989760f6ef5aa830990d7a7533c2ec092"
"reference": "6277d17e7e07582233c5c4a49eb31cab3c86477c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/727830c989760f6ef5aa830990d7a7533c2ec092",
"reference": "727830c989760f6ef5aa830990d7a7533c2ec092",
"url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/6277d17e7e07582233c5c4a49eb31cab3c86477c",
"reference": "6277d17e7e07582233c5c4a49eb31cab3c86477c",
"shasum": ""
},
"require": {
......@@ -4549,7 +4549,7 @@
"type": "community_bridge"
}
],
"time": "2022-02-07T03:48:38+00:00"
"time": "2022-02-08T01:12:48+00:00"
},
{
"name": "laminas/laminas-session",
......@@ -5781,16 +5781,17 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "af7105cd18fe787a0edcd3ce9f85b51d58fa1e15"
"reference": "fe65dc242bba90a99da7d818561e46d4c3349e36"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/af7105cd18fe787a0edcd3ce9f85b51d58fa1e15",
"reference": "af7105cd18fe787a0edcd3ce9f85b51d58fa1e15",
"url": "https://api.github.com/repos/symfony/console/zipball/fe65dc242bba90a99da7d818561e46d4c3349e36",
"reference": "fe65dc242bba90a99da7d818561e46d4c3349e36",
"shasum": ""
},
"require": {
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/string": "^5.4|^6.0"
......@@ -5868,7 +5869,7 @@
"type": "tidelift"
}
],
"time": "2022-01-31T17:00:26+00:00"
"time": "2022-02-08T22:17:58+00:00"
},
{
"name": "symfony/deprecation-contracts",
......
data/ddl_columns_pos.php
View file @ acaa5c5f
......@@ -1275,39 +1275,24 @@ return [
'CODE',
'LIBELLE',
'TYPE_INTERVENANT_ID',
'SERVICE_STATUTAIRE',
'ANNEE_ID',
'ORDRE',
'SERVICE',
'DOSSIER_SELECTIONNABLE',
'DOSSIER',
'MOTIF_NON_PAIEMENT',
'CONTRAT',
'REFERENTIEL',
'PLAFOND_HC_REMU_FC',
'PRIORITAIRE_INDICATEURS',
'SERVICE_STATUTAIRE',
'DEPASSEMENT_SERVICE_DU_SANS_HC',
'CLOTURE',
'SERVICE_EXTERIEUR',
'TAUX_CHARGES_PATRONALES',
'DOSSIER_ADRESSE',
'DOSSIER',
'DOSSIER_VISUALISATION',
'DOSSIER_EDITION',
'DOSSIER_SELECTIONNABLE',
'DOSSIER_IDENTITE_COMP',
'DOSSIER_CONTACT',
'DOSSIER_TEL_PERSO',
'DOSSIER_EMAIL_PERSO',
'DOSSIER_EMPLOYEUR',
'DOSSIER_ADRESSE',
'DOSSIER_BANQUE',
'DOSSIER_IDENTITE_COMP',
'DOSSIER_INSEE',
'DOSSIER_TEL_PERSO',
'PRIORITAIRE_INDICATEURS',
'HISTO_CREATION',
'HISTO_CREATEUR_ID',
'HISTO_MODIFICATION',
'HISTO_MODIFICATEUR_ID',
'HISTO_DESTRUCTION',
'HISTO_DESTRUCTEUR_ID',
'ANNEE_ID',
'PAIEMENT_VISUALISATION',
'FORMULE_VISUALISATION',
'MODIF_SERVICE_DU',
'MODIF_SERVICE_DU_VISUALISATION',
'DOSSIER_EMPLOYEUR',
'DOSSIER_AUTRE_1',
'DOSSIER_AUTRE_1_VISUALISATION',
'DOSSIER_AUTRE_1_EDITION',
......@@ -1323,28 +1308,42 @@ return [
'DOSSIER_AUTRE_5',
'DOSSIER_AUTRE_5_VISUALISATION',
'DOSSIER_AUTRE_5_EDITION',
'CODES_CORRESP_1',
'CODES_CORRESP_2',
'CODES_CORRESP_3',
'CODES_CORRESP_4',
'PJ_VISUALISATION',
'PJ_TELECHARGEMENT',
'PJ_EDITION',
'PJ_ARCHIVAGE',
'REFERENTIEL_VISUALISATION',
'REFERENTIEL_EDITION',
'CONTRAT_VISUALISATION',
'CONTRAT_DEPOT',
'SERVICE_VISUALISATION',
'SERVICE_EDITION',
'DOSSIER_VISUALISATION',
'DOSSIER_EDITION',
'CONSEIL_RESTREINT',
'CONSEIL_RESTREINT_VISUALISATION',
'CONSEIL_RESTREINT_DUREE_VIE',
'CONSEIL_ACA',
'CONSEIL_ACA_VISUALISATION',
'CONSEIL_ACA_DUREE_VIE',
'CONTRAT',
'CONTRAT_VISUALISATION',
'CONTRAT_DEPOT',
'SERVICE',
'SERVICE_VISUALISATION',
'SERVICE_EDITION',
'SERVICE_EXTERIEUR',
'REFERENTIEL',
'REFERENTIEL_VISUALISATION',
'REFERENTIEL_EDITION',
'MOTIF_NON_PAIEMENT',
'CLOTURE',
'MODIF_SERVICE_DU',
'MODIF_SERVICE_DU_VISUALISATION',
'PAIEMENT_VISUALISATION',
'FORMULE_VISUALISATION',
'CODES_CORRESP_1',
'CODES_CORRESP_2',
'CODES_CORRESP_3',
'CODES_CORRESP_4',
'HISTO_CREATION',
'HISTO_CREATEUR_ID',
'HISTO_MODIFICATION',
'HISTO_MODIFICATEUR_ID',
'HISTO_DESTRUCTION',
'HISTO_DESTRUCTEUR_ID',
],
'STATUT_PRIVILEGE' => [
'STATUT_ID',
......
module/Application/src/Traits/NiveauEtapeAwareTrait.php
View file @ acaa5c5f
......@@ -11,19 +11,11 @@ use Application\Entity\NiveauEtape;
*/
trait NiveauEtapeAwareTrait
{
/**
* @var NiveauEtape
*/
protected $niveauEtape;
protected ?NiveauEtape $niveauEtape = null;
/**
* Spécifie le niveau d'étape concerné.
*
* @param NiveauEtape $niveauEtape le niveau d'étape concerné
*/
public function setNiveauEtape(NiveauEtape $niveauEtape = null)
public function setNiveauEtape(?NiveauEtape $niveauEtape = null)
{
$this->niveauEtape = $niveauEtape;
......@@ -32,12 +24,7 @@ trait NiveauEtapeAwareTrait
/**
* Retourne le niveau d'étape concerné.
*
* @return NiveauEtape
*/
public function getNiveauEtape(): NiveauEtape
public function getNiveauEtape(): ?NiveauEtape
{
return $this->niveauEtape;
}
......
module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml
View file @ acaa5c5f
......@@ -62,21 +62,8 @@
<join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
</join-columns>
</many-to-one>
<one-to-many field="typeAgrementStatut" target-entity="Application\Entity\Db\TypeAgrementStatut" mapped-by="statut"/>
<one-to-many field="typePieceJointeStatut" target-entity="Application\Entity\Db\TypePieceJointeStatut"
mapped-by="statut" fetch="EXTRA_LAZY"/>
<many-to-many field="privilege" target-entity="UnicaenAuth\Entity\Db\Privilege">
<cascade>
<cascade-all/>
</cascade>
<join-table name="STATUT_PRIVILEGE">
<join-columns>
<join-column name="STATUT_ID" referenced-column-name="ID"/>
</join-columns>
<inverse-join-columns>
<join-column name="PRIVILEGE_ID" referenced-column-name="ID"/>
</inverse-join-columns>
</join-table>
</many-to-many>
</entity>
</doctrine-mapping>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment