@@ -57,9 +57,8 @@ |
||
| 57 | 57 | /** |
| 58 | 58 | * Set the user-object |
| 59 | 59 | * |
| 60 | - * @param Hybridauth\Entity\Profile $userProfile The userprofile to use |
|
| 61 | 60 | * |
| 62 | - * @return HybridAuthUserProxy |
|
| 61 | + * @return HybridAuthUserWrapper |
|
| 63 | 62 | */ |
| 64 | 63 | public function setUser(Profile $user) |
| 65 | 64 | { |
@@ -51,10 +51,9 @@ |
||
| 51 | 51 | /** |
| 52 | 52 | * Create the service using the configuration from the modules config-file |
| 53 | 53 | * |
| 54 | - * @param ServiceLocator $services The ServiceLocator |
|
| 55 | 54 | * |
| 56 | 55 | * @see \Zend\ServiceManager\FactoryInterface::createService() |
| 57 | - * @return Hybrid_Auth |
|
| 56 | + * @return SessionContainer |
|
| 58 | 57 | */ |
| 59 | 58 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 60 | 59 | { |
@@ -65,7 +65,6 @@ |
||
| 65 | 65 | /** |
| 66 | 66 | * Set the user-object |
| 67 | 67 | * |
| 68 | - * @param HybridAuthUserWrapper $userProfile The userprofile to use |
|
| 69 | 68 | * |
| 70 | 69 | * @return UserToken |
| 71 | 70 | */ |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | /** |
| 75 | 75 | * create an instance of the viewhelper |
| 76 | 76 | * |
| 77 | - * @param mixed $viewHelperManager |
|
| 77 | + * @param HelperPluginManager $viewHelperManager |
|
| 78 | 78 | */ |
| 79 | 79 | public function __construct(HelperPluginManager $viewHelperManager, MvcEvent $mvcEvent) |
| 80 | 80 | { |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | |
| 33 | 33 | return array('OrgHeiglHybridAuth' => array( |
| 34 | 34 | 'hybrid_auth' => array( |
| 35 | - // 'base_url' => 'http://example.com/auth/backend', |
|
| 35 | + // 'base_url' => 'http://example.com/auth/backend', |
|
| 36 | 36 | 'providers' => array( |
| 37 | 37 | 'Twitter' => array('enabled' => false, 'keys' => array('key' => '', 'secret' => '')), |
| 38 | 38 | ), |
@@ -44,12 +44,12 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | class UserWrapperFactory |
| 46 | 46 | { |
| 47 | - /** |
|
| 48 | - * Create the user-Proxy according to the given User-Object |
|
| 49 | - * |
|
| 50 | - * @return UserInterface |
|
| 51 | - * @throws \UnexpectedValueException |
|
| 52 | - */ |
|
| 47 | + /** |
|
| 48 | + * Create the user-Proxy according to the given User-Object |
|
| 49 | + * |
|
| 50 | + * @return UserInterface |
|
| 51 | + * @throws \UnexpectedValueException |
|
| 52 | + */ |
|
| 53 | 53 | public function factory($userObject) |
| 54 | 54 | { |
| 55 | 55 | switch (get_class($userObject)) |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | throw new \UnexpectedValueException('User is not connected'); |
| 122 | 122 | } |
| 123 | 123 | $profile = $backend->getUserProfile(); |
| 124 | - // error_log(print_R($this->userWrapperFactory->factory($profile),true)); |
|
| 124 | + // error_log(print_R($this->userWrapperFactory->factory($profile),true)); |
|
| 125 | 125 | $this->session->offsetSet('authenticated', $backend->isAuthorized()); |
| 126 | 126 | $this->session->offsetSet('user', $this->userWrapperFactory->factory($profile)); |
| 127 | 127 | $this->session->offsetSet('backend', $provider); |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | |
| 73 | 73 | $userToken = new UserToken(); |
| 74 | 74 | $userToken->setService($service) |
| 75 | - ->setUser($user); |
|
| 75 | + ->setUser($user); |
|
| 76 | 76 | |
| 77 | 77 | return $userToken; |
| 78 | 78 | |
@@ -67,8 +67,8 @@ |
||
| 67 | 67 | |
| 68 | 68 | $controller = new IndexController(); |
| 69 | 69 | $controller->setSession($session) |
| 70 | - ->setAuthenticator($authenticator) |
|
| 71 | - ->setUserWrapperFactory($wrapperFactory); |
|
| 70 | + ->setAuthenticator($authenticator) |
|
| 71 | + ->setUserWrapperFactory($wrapperFactory); |
|
| 72 | 72 | return $controller; |
| 73 | 73 | } |
| 74 | 74 | } |