Commit ca864a31 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'fix-utilisateur-domaine-inconnu' into develop

parents 3aa337cf ab8ebcea

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
        "ext-imagick":                   "*",

        "ext-readline":                  "*",

        "unicaen/app":                   "^1.3",

        "unicaen/auth":                  "^1.2",

        "unicaen/auth":                  "dev-release-1.3.5 as 1.3.4",

        "unicaen/faq":                   "^1.0",

        "unicaen/ldap":                  "^2.1",

        "unicaen/import":                "1.0.13",

composer.lock

+15 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "544dc6ec23d299678ca49734acb51b65",

    "content-hash": "8afccfba62e406dabd5beca78b7bc0b3",

    "packages": [

        {

            "name": "beberlei/assert",
@@ -1975,11 +1975,11 @@ 
        },

        {

            "name": "unicaen/auth",

            "version": "1.3.3",

            "version": "dev-release-1.3.5",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/auth.git",

                "reference": "2117b1ad811c1dbd1ad36de5d45da28abee62efd"

                "reference": "5e8ee47f61c98249a46a030ee5a6750436c4ba14"

            },

            "require": {

                "bjyoungblood/bjy-authorize": ">=1.4",
@@ -2002,7 +2002,7 @@ 
                ]

            },

            "description": "Module d'authentification pour les applications Unicaen",

            "time": "2019-01-29T14:35:35+00:00"

            "time": "2019-02-04T14:09:18+00:00"

        },

        {

            "name": "unicaen/code",
@@ -3895,9 +3895,17 @@ 
            "time": "2018-02-26T15:47:19+00:00"

        }

    ],

    "aliases": [],

    "aliases": [

        {

            "alias": "1.3.4",

            "alias_normalized": "1.3.4.0",

            "version": "dev-release-1.3.5",

            "package": "unicaen/auth"

        }

    ],

    "minimum-stability": "stable",

    "stability-flags": {

        "unicaen/auth": 20,

        "bjyoungblood/bjy-authorize": 20

    },

    "prefer-stable": false,
@@ -3905,7 +3913,8 @@ 
    "platform": {

        "ext-fileinfo": "*",

        "ext-json": "*",

        "ext-imagick": "*"

        "ext-imagick": "*",

        "ext-readline": "*"

    },

    "platform-dev": []

}

module/Application/src/Application/Entity/Db/AppPseudoUtilisateurAwareTrait.php

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?php



namespace Application\Entity\Db;



trait AppPseudoUtilisateurAwareTrait

{

    /**

     * @var Utilisateur

     */

    protected $appPseudoUtilisateur;



    /**

     * @param Utilisateur $appPseudoUtilisateur

     */

    public function setAppPseudoUtilisateur(Utilisateur $appPseudoUtilisateur)

    {

        $this->appPseudoUtilisateur = $appPseudoUtilisateur;

    }

}
 
 No newline at end of file

module/Application/src/Application/Entity/Db/Etablissement.php

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ class Etablissement implements StructureConcreteInterface, HistoriqueAwareInterf 
    use HistoriqueAwareTrait;

    use SourceAwareTrait;



    const SOURCE_CODE_ETABLISSEMENT_INCONNU = 'ETAB_INCONNU';



    const CODE_STRUCTURE_COMUE = Structure::CODE_COMUE;



    protected $id;

module/Application/src/Application/Entity/Db/Repository/EtablissementRepository.php

+18 −0
Original line number Diff line number Diff line
@@ -11,6 +11,24 @@ use UnicaenApp\Exception\RuntimeException; 
 */

class EtablissementRepository extends DefaultEntityRepository

{

    /**

     * Retourne l'établissement "inconnu".

     *

     * Cet établissement est utilisé pour rattacher un individu utilisateur à un établissement lorsque

     * son EPPN contient un domaine inconnu.

     *

     * @return Etablissement|null

     */

    public function fetchEtablissementInconnu()

    {

        $etab = $this->findOneBySourceCode($sourceCode = Etablissement::SOURCE_CODE_ETABLISSEMENT_INCONNU);

        if ($etab === null) {

            throw new RuntimeException("Anomalie: l'établissement 'inconnu' doit exister dans la BDD (SOURCE_CODE='$sourceCode')");

        }



        return $etab;

    }



    /**

     * Recherche un établissement par son code de structure.

     *