From 5e0cdd917aa7b33cc895f9ffe203d1256d279278 Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Thu, 18 Apr 2013 13:51:13 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20suite=20=C3=A0=20la=20Refactorisat?=
=?UTF-8?q?ion=20de=20la=20classe=20de=20l'entit=C3=A9=20LDAP=20People.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/UnicaenAuth/Authentication/Storage/LdapDb.php | 3 ++-
src/UnicaenAuth/Entity/Ldap/PeopleAdapter.php | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/UnicaenAuth/Authentication/Storage/LdapDb.php b/src/UnicaenAuth/Authentication/Storage/LdapDb.php
index ccd4cd4..1c84f51 100644
--- a/src/UnicaenAuth/Authentication/Storage/LdapDb.php
+++ b/src/UnicaenAuth/Authentication/Storage/LdapDb.php
@@ -73,7 +73,8 @@ class LdapDb implements Storage\StorageInterface, ServiceManagerAwareInterface
// moyen de savoir si l'utilisateur a été créé à partir de l'annuaire LDAP: mdp = 'ldap' dans la table
if (!$dbIdentity || $dbIdentity->getPassword() == 'ldap') {
$ldapIdentity = $this->getLdapStorage()->read();
- $identity = new \UnicaenAuth\Entity\Ldap\PeopleAdapter($ldapIdentity, $userId);
+ $identity = new \UnicaenAuth\Entity\Ldap\PeopleAdapter($ldapIdentity->getData(), $userId);
+// var_dump($identity);die;
}
return $identity;
}
diff --git a/src/UnicaenAuth/Entity/Ldap/PeopleAdapter.php b/src/UnicaenAuth/Entity/Ldap/PeopleAdapter.php
index f9febf5..1bef8d0 100644
--- a/src/UnicaenAuth/Entity/Ldap/PeopleAdapter.php
+++ b/src/UnicaenAuth/Entity/Ldap/PeopleAdapter.php
@@ -19,10 +19,10 @@ class PeopleAdapter extends \UnicaenApp\Entity\Ldap\People implements \ZfcUser\E
/**
* Constructeur.
*
- * @param array|object $data Source de données
+ * @param array $data Valeurs des attributs brutes
* @param int $userId Id éventuel de l'utilisateur dans la base de données de l'appli
*/
- public function __construct($data, $userId = null)
+ public function __construct(array $data = array(), $userId = null)
{
parent::__construct($data);
$this->setId($userId);
--
GitLab