Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
lib
unicaen
auth
Commits
4092eaf1
Commit
4092eaf1
authored
Sep 18, 2019
by
Bertrand Gauthier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release-3.0.1'
parents
024799dd
ae13cdeb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
src/UnicaenAuth/Options/ModuleOptionsFactory.php
src/UnicaenAuth/Options/ModuleOptionsFactory.php
+5
-8
No files found.
src/UnicaenAuth/Options/ModuleOptionsFactory.php
View file @
4092eaf1
...
...
@@ -4,26 +4,23 @@ namespace UnicaenAuth\Options;
use
Assert\Assertion
;
use
Assert\AssertionFailedException
;
use
Interop\Container\ContainerInterface
;
use
UnicaenApp\Exception\RuntimeException
;
use
Zend\ServiceManager\FactoryInterface
;
use
Zend\ServiceManager\ServiceLocatorInterface
;
/**
* Description of ModuleOptionsFactory
*
* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
*/
class
ModuleOptionsFactory
implements
FactoryInterface
class
ModuleOptionsFactory
{
/**
* Create service
*
* @param
ServiceLocatorInterface $serviceLocato
r
* @param
ContainerInterface $containe
r
* @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
=
array_merge
(
$config
[
'zfcuser'
],
$moduleConfig
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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