Commit 48999c44 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Changement pour matching de signature

parent 4c2bd971

module/Application/src/Application/Controller/AbstractController.php

+3 −1
Changes for module/Application/src/Application/Controller/AbstractController.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ use UnicaenApp\Controller\Plugin\ConfirmPlugin; 
use UnicaenApp\Controller\Plugin\Mail;

use Zend\Http\Request as HttpRequest;

use Zend\Mvc\Controller\AbstractActionController;

use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger;

use ZfcUser\Controller\Plugin\ZfcUserAuthentication;



/**
@@ -26,7 +27,7 @@ use ZfcUser\Controller\Plugin\ZfcUserAuthentication; 
 * @method ZfcUserAuthentication zfcUserAuthentication()

 * @method HttpRequest getRequest()

 * @method UploaderPlugin uploader()

 * @method boolean isAllowed($resource, $privilege)

 * @method boolean isAllowed($resource, $privilege = null)

 * @method UrlThesePlugin urlThese()

 * @method UrlDoctorant urlDoctorant()

 * @method UrlFichier urlFichier()
@@ -34,6 +35,7 @@ use ZfcUser\Controller\Plugin\ZfcUserAuthentication; 
 * @method UrlWorkflow urlWorkflow()

 * @method Mail mail()

 * @method ConfirmPlugin confirm()

 * @method FlashMessenger flashMessenger()

 */

class AbstractController extends AbstractActionController

    implements UserContextServiceAwareInterface

module/Application/src/Application/Controller/UtilisateurController.php

+7 −8
Changes for module/Application/src/Application/Controller/UtilisateurController.php: 7 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
    /**

     * @var AuthenticationService

     */

    private $authenticationService;

    protected $authenticationService;



    /**

     * @var ShibService

     */

    private $shibService;

    protected $shibService;



    /**

     * @var CreationUtilisateurForm
@@ -235,8 +235,7 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
        if (isset($currentIdentity['shib'])) {

            /** @var ShibUser $currentIdentity */

            $currentIdentity = $currentIdentity['shib'];

        }

        elseif (isset($currentIdentity['ldap'])) {

        } elseif (isset($currentIdentity['ldap'])) {

            /** @var People $currentIdentity */

            $currentIdentity = $currentIdentity['ldap'];

        } else {
@@ -291,8 +290,7 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
        if (isset($currentIdentity['shib'])) {

            /** @var ShibUser $currentIdentity */

            $currentIdentity = $currentIdentity['shib'];

        }

        elseif (isset($currentIdentity['ldap'])) {

        } elseif (isset($currentIdentity['ldap'])) {

            /** @var People $currentIdentity */

            $currentIdentity = $currentIdentity['ldap'];

        } else {
@@ -425,7 +423,7 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
        $utilisateurs = $this->utilisateurService->getRepository()->findByIndividu($individu, $isLocal = true); // done

        // NB: findByIndividu() avec $isLocal = true renverra 1 utilisateur au maximum

        $utilisateur = $utilisateurs ? current($utilisateurs) : null;

        if ($utilisateur === null AND $individu->getEmail() !== null) {

        if ($utilisateur === null and $individu->getEmail() !== null) {

            $utilisateur = $this->utilisateurService->getRepository()->findByUsername($individu->getEmail());

        }
@@ -471,7 +469,8 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
        return $this->redirect()->toRoute('utilisateur/gerer-utilisateur', ['individu' => $individu->getId()], [], true);

    }



    public function initCompteAction() {

    public function initCompteAction()

    {

        $token = $this->params()->fromRoute('token');

        $utilisateur = $this->utilisateurService->getRepository()->findByToken($token);