Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lib
unicaen
auth
Commits
ae13cdeb
Commit
ae13cdeb
authored
Sep 18, 2019
by
Bertrand Gauthier
Browse files
Correction de ModuleOptionsFactory fusionné à la légère.
parent
96783864
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/UnicaenAuth/Options/ModuleOptionsFactory.php
View file @
ae13cdeb
...
@@ -4,26 +4,23 @@ namespace UnicaenAuth\Options;
...
@@ -4,26 +4,23 @@ namespace UnicaenAuth\Options;
use
Assert\Assertion
;
use
Assert\Assertion
;
use
Assert\AssertionFailedException
;
use
Assert\AssertionFailedException
;
use
Interop\Container\ContainerInterface
;
use
UnicaenApp\Exception\RuntimeException
;
use
UnicaenApp\Exception\RuntimeException
;
use
Zend\ServiceManager\FactoryInterface
;
use
Zend\ServiceManager\ServiceLocatorInterface
;
/**
/**
* Description of ModuleOptionsFactory
*
* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
*/
*/
class
ModuleOptionsFactory
implements
FactoryInterface
class
ModuleOptionsFactory
{
{
/**
/**
* Create service
* Create service
*
*
* @param
ServiceLocatorInterface $serviceLocato
r
* @param
ContainerInterface $containe
r
* @return mixed
* @return mixed
*/
*/
public
function
createService
(
ServiceLocatorInterface
$serviceLocato
r
)
public
function
__invoke
(
ContainerInterface
$containe
r
)
{
{
$config
=
$
serviceLocato
r
->
get
(
'Configuration'
);
$config
=
$
containe
r
->
get
(
'Configuration'
);
$moduleConfig
=
isset
(
$config
[
'unicaen-auth'
])
?
$config
[
'unicaen-auth'
]
:
[];
$moduleConfig
=
isset
(
$config
[
'unicaen-auth'
])
?
$config
[
'unicaen-auth'
]
:
[];
$moduleConfig
=
array_merge
(
$config
[
'zfcuser'
],
$moduleConfig
);
$moduleConfig
=
array_merge
(
$config
[
'zfcuser'
],
$moduleConfig
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment