Skip to content

Commit d364091

Browse files
committed
Merge branch 'master' of https://github.com/ProspectOne/UserModule into develop
# Conflicts: # src/Service/Factory/AuthAdapterFactory.php
2 parents 7abf208 + 5610da7 commit d364091

File tree

4 files changed

+273
-276
lines changed

4 files changed

+273
-276
lines changed

config/module.config.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,9 @@
114114
'service_manager' => [
115115
'factories' => [
116116
AuthenticationService::class => Service\Factory\AuthenticationServiceFactory::class,
117-
Service\AuthAdapter::class => Service\Factory\AuthAdapterFactory::class,
117+
"ProspectOne\UserModule\Service\AuthAdapter" => AuthAdapterServiceFactory::class,
118118
Service\AuthManager::class => Service\Factory\AuthManagerFactory::class,
119119
Service\UserManager::class => Service\Factory\UserManagerFactory::class,
120-
AuthAdapterService::class => AuthAdapterServiceFactory::class,
121120
'ProspectOne\UserModule\Bcrypt' => BcryptFactory::class,
122121
'ProspectOne\UserModule\CurrentUser' => CurrentUserFactory::class,
123122
UserForm::class => UserFormFactory::class,
@@ -126,6 +125,9 @@
126125
'ProspectOne\UserModule\UserHydrator' => HydratorFactory::class,
127126
DisabledSessionManager::class => InvokableFactory::class,
128127
],
128+
'aliases' => [
129+
AuthAdapterService::class => "ProspectOne\UserModule\Service\AuthAdapter",
130+
]
129131
],
130132
'view_manager' => [
131133
'template_path_stack' => [

src/Service/AuthAdapter.php

Lines changed: 0 additions & 265 deletions
This file was deleted.

0 commit comments

Comments
 (0)