From e9dc411d1fc2daed37f5e3b354ec4eaf7e294397 Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Tue, 19 Feb 2013 08:46:38 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20cl=C3=A9=20"unicaen-auth"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/module.config.php | 4 ++--
.../Authentication/Adapter/AdapterChainServiceFactory.php | 4 ++--
src/UnicaenAuth/Authentication/Adapter/Db.php | 2 +-
src/UnicaenAuth/Authentication/Adapter/Ldap.php | 2 +-
src/UnicaenAuth/Authentication/Storage/Ldap.php | 2 +-
src/UnicaenAuth/Authentication/Storage/Mixed.php | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/module.config.php b/config/module.config.php
index ecccac0..9a1d59d 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -63,7 +63,7 @@ return array(
'unicaen-auth' => $settings,
'view_manager' => array(
'template_path_stack' => array(
- 'unicaen-user' => __DIR__ . '/../view',
+ 'unicaen-auth' => __DIR__ . '/../view',
),
),
'service_manager' => array(
@@ -89,7 +89,7 @@ return array(
'options' => array(
'route' => '/utilisateur/generer-sesame',
'defaults' => array(
- 'controller' => 'unicaen-user',
+ 'controller' => 'unicaen-auth',
'action' => 'generer-sesame',
),
),
diff --git a/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php b/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php
index a1e4376..09a08d4 100644
--- a/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php
+++ b/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php
@@ -14,10 +14,10 @@ class AdapterChainServiceFactory implements FactoryInterface
{
$chain = new AdapterChain;
- $userService = $serviceLocator->get('unicaen-user_user_service');
+ $userService = $serviceLocator->get('unicaen-auth_user_service');
/* @var $options \UnicaenAuth\Options\ModuleOptions */
- $options = $serviceLocator->get('unicaen-user_module_options');
+ $options = $serviceLocator->get('unicaen-auth_module_options');
if ($options->getCasAuthenticationActivated()) {
/* @var $casAdapter Cas */
$casAdapter = $serviceLocator->get('UnicaenAuth\Authentication\Adapter\Cas');
diff --git a/src/UnicaenAuth/Authentication/Adapter/Db.php b/src/UnicaenAuth/Authentication/Adapter/Db.php
index c5ad7de..20b5aeb 100644
--- a/src/UnicaenAuth/Authentication/Adapter/Db.php
+++ b/src/UnicaenAuth/Authentication/Adapter/Db.php
@@ -98,7 +98,7 @@ class Db extends \ZfcUser\Authentication\Adapter\Db
public function getUnicaenAuthOptions()
{
if (!$this->unicaenUserOptions instanceof AuthenticationOptionsInterface) {
- $this->setUnicaenAuthOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+ $this->setUnicaenAuthOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
}
return $this->unicaenUserOptions;
}
diff --git a/src/UnicaenAuth/Authentication/Adapter/Ldap.php b/src/UnicaenAuth/Authentication/Adapter/Ldap.php
index 55320cd..fb18a26 100644
--- a/src/UnicaenAuth/Authentication/Adapter/Ldap.php
+++ b/src/UnicaenAuth/Authentication/Adapter/Ldap.php
@@ -198,7 +198,7 @@ class Ldap extends AbstractAdapter implements ServiceManagerAwareInterface, Even
public function getOptions()
{
if (!$this->options instanceof AuthenticationOptionsInterface) {
- $this->setOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+ $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
}
return $this->options;
}
diff --git a/src/UnicaenAuth/Authentication/Storage/Ldap.php b/src/UnicaenAuth/Authentication/Storage/Ldap.php
index c6b7e55..e427027 100644
--- a/src/UnicaenAuth/Authentication/Storage/Ldap.php
+++ b/src/UnicaenAuth/Authentication/Storage/Ldap.php
@@ -188,7 +188,7 @@ class Ldap implements Storage\StorageInterface, ServiceManagerAwareInterface
public function getOptions()
{
if (!$this->options instanceof AuthenticationOptionsInterface) {
- $this->setOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+ $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
}
return $this->options;
}
diff --git a/src/UnicaenAuth/Authentication/Storage/Mixed.php b/src/UnicaenAuth/Authentication/Storage/Mixed.php
index 772f230..46f0640 100644
--- a/src/UnicaenAuth/Authentication/Storage/Mixed.php
+++ b/src/UnicaenAuth/Authentication/Storage/Mixed.php
@@ -185,7 +185,7 @@ class Mixed implements Storage\StorageInterface, ServiceManagerAwareInterface
public function getOptions()
{
if (!$this->options instanceof AuthenticationOptionsInterface) {
- $this->setOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+ $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
}
return $this->options;
}
--
GitLab