Commit 013f2a37 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.0.7'

parents b1b5b1dc 7c0118fe

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":                  "^1.3",

        "unicaen/faq":                   "^1.0",

        "unicaen/ldap":                  "^2.1",

        "unicaen/import":                "1.0.13",

composer.lock

+6 −5
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": "8cf89d8aa3a8b99d31c267555f254266",

    "packages": [

        {

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

        {

            "name": "unicaen/auth",

            "version": "1.3.3",

            "version": "1.3.5",

            "source": {

                "type": "git",

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

                "reference": "2117b1ad811c1dbd1ad36de5d45da28abee62efd"

                "reference": "04fb4d44fef8055d97c67b97ae2933bba3fd4c26"

            },

            "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-04T15:47:07+00:00"

        },

        {

            "name": "unicaen/code",
@@ -3905,7 +3905,8 @@ 
    "platform": {

        "ext-fileinfo": "*",

        "ext-json": "*",

        "ext-imagick": "*"

        "ext-imagick": "*",

        "ext-readline": "*"

    },

    "platform-dev": []

}

config/autoload/version.global.php

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
return [

    'unicaen-app' => [

        'app_infos' => [

            'version' => '1.0.6',

            'date' => '01/02/2019',

            'version' => '1.0.7',

            'date' => '04/02/2019',

        ],

    ],

    'comment' => 'Fichier généré le 01/02/2019 à 11:02:57 avec /home/gauthierb/workspace/sygal/bump-version',

    'comment' => 'Fichier généré le 04/02/2019 à 16:40:26 avec /home/gauthierb/workspace/sygal/bump-version',

];

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;